call the function

AddCommitView added
URL for hackathon UI
2024-10-03 13:33:38 +02:00 · 2024-10-03 12:58:36 +02:00 · 2024-10-03 13:19:48 +03:00 · 2024-10-03 12:27:27 +03:00
294 changed files with 2790 additions and 8875 deletions
@@ -2,7 +2,7 @@ name: .NET Build and Publish

 on:
  push:
-    branches: ["main", "dev", "release/*"] # Continuous delivery on every long-lived branch
+    branches: ["main", "dev"] # Continuous delivery on every long-lived branch
    tags: ["v3.*"] # Manual delivery on every 3.x tag

 jobs:
@@ -49,7 +49,6 @@ jobs:
    needs: build
    env:
      IS_TAG_BUILD: ${{ github.ref_type == 'tag' }}
-      IS_RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release/') || github.ref_name == 'main'}}
    steps:
      - name: 🔫 Trigger Build Installers
        uses: ALEEF02/workflow-dispatch@v3.0.0
@@ -58,7 +57,7 @@ jobs:
          workflow: Build Installers
          repo: specklesystems/connector-installers
          token: ${{ secrets.CONNECTORS_GH_TOKEN }}
-          inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build.outputs.version }}", "public_release": ${{ env.IS_TAG_BUILD }}, "store_artifacts": ${{ env.IS_RELEASE_BRANCH }} }'
+          inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build.outputs.version }}", "public_release": ${{ env.IS_TAG_BUILD }} }'
          ref: main
          wait-for-completion: true
          wait-for-completion-interval: 10s
@@ -9,6 +9,7 @@ using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
+using Speckle.Connectors.DUI.Settings;
 using Speckle.Converters.ArcGIS3;
 using Speckle.Converters.ArcGIS3.Utils;
 using Speckle.Converters.Common;
@@ -49,6 +50,10 @@ public sealed class ArcGISReceiveBinding : IReceiveBinding
    _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
  }

+#pragma warning disable CA1024
+  public List<ICardSetting> GetReceiveSettings() => [];
+#pragma warning restore CA1024
+
  public async Task Receive(string modelCardId)
  {
    try
@@ -76,19 +81,23 @@ public sealed class ArcGISReceiveBinding : IReceiveBinding
        .ServiceProvider.GetRequiredService<ReceiveOperation>()
        .Execute(
          modelCard.GetReceiveInfo("ArcGIS"), // POC: get host app name from settings? same for GetSendInfo
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
-          cancellationToken
+          cancellationToken,
+          (status, progress) =>
+            _operationProgressManager.SetModelProgress(
+              Parent,
+              modelCardId,
+              new ModelCardProgress(modelCardId, status, progress),
+              cancellationToken
+            )
        )
        .ConfigureAwait(false);

      modelCard.BakedObjectIds = receiveOperationResults.BakedObjectIds.ToList();
-      await Commands
-        .SetModelReceiveResult(
-          modelCardId,
-          receiveOperationResults.BakedObjectIds,
-          receiveOperationResults.ConversionResults
-        )
-        .ConfigureAwait(false);
+      Commands.SetModelReceiveResult(
+        modelCardId,
+        receiveOperationResults.BakedObjectIds,
+        receiveOperationResults.ConversionResults
+      );
    }
    catch (OperationCanceledException)
    {
@@ -100,7 +109,7 @@ public sealed class ArcGISReceiveBinding : IReceiveBinding
    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
    {
      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, ex);
    }
  }

@@ -1,6 +1,5 @@
 using ArcGIS.Desktop.Mapping;
 using ArcGIS.Desktop.Mapping.Events;
-using Speckle.Connectors.ArcGIS.Utils;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;

@@ -8,13 +7,11 @@ namespace Speckle.Connectors.ArcGIS.Bindings;

 public class ArcGISSelectionBinding : ISelectionBinding
 {
-  private readonly MapMembersUtils _mapMemberUtils;
  public string Name => "selectionBinding";
  public IBrowserBridge Parent { get; }

-  public ArcGISSelectionBinding(IBrowserBridge parent, MapMembersUtils mapMemberUtils)
+  public ArcGISSelectionBinding(IBrowserBridge parent)
  {
-    _mapMemberUtils = mapMemberUtils;
    Parent = parent;
    var topLevelHandler = parent.TopLevelExceptionHandler;

@@ -55,8 +52,14 @@ public class ArcGISSelectionBinding : ISelectionBinding
    List<MapMember> allNestedMembers = new();
    foreach (MapMember member in selectedMembers)
    {
-      var layerMapMembers = _mapMemberUtils.UnpackMapLayers(selectedMembers);
-      allNestedMembers.AddRange(layerMapMembers);
+      if (member is GroupLayer group)
+      {
+        GetLayersFromGroup(group, allNestedMembers);
+      }
+      else
+      {
+        allNestedMembers.Add(member);
+      }
    }

    List<string> objectTypes = allNestedMembers
@@ -9,7 +9,6 @@ using ArcGIS.Desktop.Mapping.Events;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.ArcGIS.Filters;
-using Speckle.Connectors.ArcGIS.Utils;
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Cancellation;
 using Speckle.Connectors.Common.Operations;
@@ -55,7 +54,6 @@ public sealed class ArcGISSendBinding : ISendBinding

  private List<FeatureLayer> SubscribedLayers { get; set; } = new();
  private List<StandaloneTable> SubscribedTables { get; set; } = new();
-  private readonly MapMembersUtils _mapMemberUtils;

  public ArcGISSendBinding(
    DocumentModelStore store,
@@ -66,8 +64,7 @@ public sealed class ArcGISSendBinding : ISendBinding
    ISendConversionCache sendConversionCache,
    IOperationProgressManager operationProgressManager,
    ILogger<ArcGISSendBinding> logger,
-    IArcGISConversionSettingsFactory arcGisConversionSettingsFactory,
-    MapMembersUtils mapMemberUtils
+    IArcGISConversionSettingsFactory arcGisConversionSettingsFactory
  )
  {
    _store = store;
@@ -79,7 +76,6 @@ public sealed class ArcGISSendBinding : ISendBinding
    _logger = logger;
    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
    _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
-    _mapMemberUtils = mapMemberUtils;

    Parent = parent;
    Commands = new SendBindingUICommands(parent);
@@ -93,32 +89,22 @@ public sealed class ArcGISSendBinding : ISendBinding
  private void SubscribeToArcGISEvents()
  {
    LayersRemovedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(async () => await GetIdsForLayersRemovedEvent(a).ConfigureAwait(false)),
+      a => _topLevelExceptionHandler.CatchUnhandled(() => GetIdsForLayersRemovedEvent(a)),
      true
    );

    StandaloneTablesRemovedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await GetIdsForStandaloneTablesRemovedEvent(a).ConfigureAwait(false)
-        ),
+      a => _topLevelExceptionHandler.CatchUnhandled(() => GetIdsForStandaloneTablesRemovedEvent(a)),
      true
    );

    MapPropertyChangedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await GetIdsForMapPropertyChangedEvent(a).ConfigureAwait(false)
-        ),
+      a => _topLevelExceptionHandler.CatchUnhandled(() => GetIdsForMapPropertyChangedEvent(a)),
      true
    ); // Map units, CRS etc.

    MapMemberPropertiesChangedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await GetIdsForMapMemberPropertiesChangedEvent(a).ConfigureAwait(false)
-        ),
+      a => _topLevelExceptionHandler.CatchUnhandled(() => GetIdsForMapMemberPropertiesChangedEvent(a)),
      true
    ); // e.g. Layer name

@@ -195,31 +181,28 @@ public sealed class ArcGISSendBinding : ISendBinding
  {
    RowCreatedEvent.Subscribe(
      (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
-        {
-          await OnRowChanged(args).ConfigureAwait(false);
-        }),
+      {
+        OnRowChanged(args);
+      },
      layerTable
    );
    RowChangedEvent.Subscribe(
      (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
-        {
-          await OnRowChanged(args).ConfigureAwait(false);
-        }),
+      {
+        OnRowChanged(args);
+      },
      layerTable
    );
    RowDeletedEvent.Subscribe(
      (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
-        {
-          await OnRowChanged(args).ConfigureAwait(false);
-        }),
+      {
+        OnRowChanged(args);
+      },
      layerTable
    );
  }

-  private async Task OnRowChanged(RowChangedEventArgs args)
+  private void OnRowChanged(RowChangedEventArgs args)
  {
    if (args == null || MapView.Active == null)
    {
@@ -258,38 +241,60 @@ public sealed class ArcGISSendBinding : ISendBinding
      }
    }

-    await RunExpirationChecks(false).ConfigureAwait(false);
+    RunExpirationChecks(false);
  }

-  private async Task GetIdsForLayersRemovedEvent(LayerEventsArgs args)
+  private void GetIdsForLayersRemovedEvent(LayerEventsArgs args)
  {
    foreach (Layer layer in args.Layers)
    {
      ChangedObjectIds[layer.URI] = 1;
    }
-    await RunExpirationChecks(true).ConfigureAwait(false);
+    RunExpirationChecks(true);
  }

-  private async Task GetIdsForStandaloneTablesRemovedEvent(StandaloneTableEventArgs args)
+  private void GetIdsForStandaloneTablesRemovedEvent(StandaloneTableEventArgs args)
  {
    foreach (StandaloneTable table in args.Tables)
    {
      ChangedObjectIds[table.URI] = 1;
    }
-    await RunExpirationChecks(true).ConfigureAwait(false);
+    RunExpirationChecks(true);
  }

-  private async Task GetIdsForMapPropertyChangedEvent(MapPropertyChangedEventArgs args)
+  private void AddChangedNestedObjectIds(GroupLayer group)
  {
-    foreach (Map map in args.Maps)
+    ChangedObjectIds[group.URI] = 1;
+    foreach (var member in group.Layers)
    {
-      List<MapMember> allMapMembers = _mapMemberUtils.GetAllMapMembers(map);
-      foreach (MapMember member in allMapMembers)
+      if (member is GroupLayer subGroup)
+      {
+        AddChangedNestedObjectIds(subGroup);
+      }
+      else
      {
        ChangedObjectIds[member.URI] = 1;
      }
    }
-    await RunExpirationChecks(false).ConfigureAwait(false);
+  }
+
+  private void GetIdsForMapPropertyChangedEvent(MapPropertyChangedEventArgs args)
+  {
+    foreach (Map map in args.Maps)
+    {
+      foreach (MapMember member in map.Layers)
+      {
+        if (member is GroupLayer group)
+        {
+          AddChangedNestedObjectIds(group);
+        }
+        else
+        {
+          ChangedObjectIds[member.URI] = 1;
+        }
+      }
+    }
+    RunExpirationChecks(false);
  }

  private void GetIdsForLayersAddedEvent(LayerEventsArgs args)
@@ -311,7 +316,7 @@ public sealed class ArcGISSendBinding : ISendBinding
    }
  }

-  private async Task GetIdsForMapMemberPropertiesChangedEvent(MapMemberPropertiesChangedEventArgs args)
+  private void GetIdsForMapMemberPropertiesChangedEvent(MapMemberPropertiesChangedEventArgs args)
  {
    // don't subscribe to all events (e.g. expanding group, changing visibility etc.)
    bool validEvent = false;
@@ -339,7 +344,7 @@ public sealed class ArcGISSendBinding : ISendBinding
      {
        ChangedObjectIds[member.URI] = 1;
      }
-      await RunExpirationChecks(false).ConfigureAwait(false);
+      RunExpirationChecks(false);
    }
  }

@@ -412,7 +417,13 @@ public sealed class ArcGISSendBinding : ISendBinding
            .Execute(
              mapMembers,
              modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings? same for GetReceiveInfo
-              _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
+              (status, progress) =>
+                _operationProgressManager.SetModelProgress(
+                  Parent,
+                  modelCardId,
+                  new ModelCardProgress(modelCardId, status, progress),
+                  cancellationToken
+                ),
              cancellationToken
            )
            .ConfigureAwait(false);
@@ -421,9 +432,7 @@ public sealed class ArcGISSendBinding : ISendBinding
        })
        .ConfigureAwait(false);

-      await Commands
-        .SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults)
-        .ConfigureAwait(false);
+      Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
    }
    catch (OperationCanceledException)
    {
@@ -435,7 +444,7 @@ public sealed class ArcGISSendBinding : ISendBinding
    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
    {
      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, ex);
    }
  }

@@ -444,7 +453,7 @@ public sealed class ArcGISSendBinding : ISendBinding
  /// <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(bool idsDeleted)
+  private void RunExpirationChecks(bool idsDeleted)
  {
    var senders = _store.GetSenders();
    List<string> expiredSenderIds = new();
@@ -470,7 +479,7 @@ public sealed class ArcGISSendBinding : ISendBinding
      }
    }

-    await Commands.SetModelsExpired(expiredSenderIds).ConfigureAwait(false);
+    Commands.SetModelsExpired(expiredSenderIds);
    ChangedObjectIds = new();
  }
 }
@@ -30,10 +30,9 @@ public class BasicConnectorBinding : IBasicConnectorBinding
    Commands = new BasicConnectorBindingCommands(parent);

    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged().ConfigureAwait(false);
-      });
+    {
+      Commands.NotifyDocumentChanged();
+    };
  }

  public string GetSourceApplicationName() => _speckleApplication.Slug;
@@ -60,10 +59,10 @@ public class BasicConnectorBinding : IBasicConnectorBinding

  public void RemoveModel(ModelCard model) => _store.RemoveModel(model);

-  public async Task HighlightObjects(IReadOnlyList<string> objectIds) =>
-    await HighlightObjectsOnView(objectIds.Select(x => new ObjectID(x)).ToList()).ConfigureAwait(false);
+  public void HighlightObjects(List<string> objectIds) =>
+    HighlightObjectsOnView(objectIds.Select(x => new ObjectID(x)).ToList());

-  public async Task HighlightModel(string modelCardId)
+  public void HighlightModel(string modelCardId)
  {
    var model = _store.GetModelById(modelCardId);

@@ -88,27 +87,27 @@ public class BasicConnectorBinding : IBasicConnectorBinding
    {
      return;
    }
-    await HighlightObjectsOnView(objectIds).ConfigureAwait(false);
+    HighlightObjectsOnView(objectIds);
  }

-  private async Task HighlightObjectsOnView(IReadOnlyList<ObjectID> objectIds)
+  private async void HighlightObjectsOnView(List<ObjectID> objectIds)
  {
    MapView mapView = MapView.Active;

    await QueuedTask
-      .Run(async () =>
+      .Run(() =>
      {
        List<MapMemberFeature> mapMembersFeatures = GetMapMembers(objectIds, mapView);
        ClearSelectionInTOC();
        ClearSelection();
-        await SelectMapMembersInTOC(mapMembersFeatures).ConfigureAwait(false);
+        SelectMapMembersInTOC(mapMembersFeatures);
        SelectMapMembersAndFeatures(mapMembersFeatures);
        mapView.ZoomToSelected();
      })
      .ConfigureAwait(false);
  }

-  private List<MapMemberFeature> GetMapMembers(IReadOnlyList<ObjectID> objectIds, MapView mapView)
+  private List<MapMemberFeature> GetMapMembers(List<ObjectID> objectIds, MapView mapView)
  {
    // find the layer on the map (from the objectID) and add the featureID is available
    List<MapMemberFeature> mapMembersFeatures = new();
@@ -146,7 +145,7 @@ public class BasicConnectorBinding : IBasicConnectorBinding
    MapView.Active.ClearTOCSelection();
  }

-  private void SelectMapMembersAndFeatures(IReadOnlyList<MapMemberFeature> mapMembersFeatures)
+  private void SelectMapMembersAndFeatures(List<MapMemberFeature> mapMembersFeatures)
  {
    foreach (MapMemberFeature mapMemberFeat in mapMembersFeatures)
    {
@@ -171,7 +170,7 @@ public class BasicConnectorBinding : IBasicConnectorBinding
    }
  }

-  private async Task SelectMapMembersInTOC(IReadOnlyList<MapMemberFeature> mapMembersFeatures)
+  private void SelectMapMembersInTOC(List<MapMemberFeature> mapMembersFeatures)
  {
    List<Layer> layers = new();
    List<StandaloneTable> tables = new();
@@ -187,7 +186,7 @@ public class BasicConnectorBinding : IBasicConnectorBinding
        }
        else
        {
-          await QueuedTask.Run(() => layer.SetExpanded(true)).ConfigureAwait(false);
+          QueuedTask.Run(() => layer.SetExpanded(true));
        }
      }
      else if (member is StandaloneTable table)
@@ -2,7 +2,6 @@ using System.Drawing;
 using ArcGIS.Core.CIM;
 using ArcGIS.Core.Data;
 using ArcGIS.Desktop.Mapping;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Converters.ArcGIS3.Utils;
 using Speckle.Objects;
 using Speckle.Objects.Other;
@@ -56,15 +55,14 @@ public class ArcGISColorManager
  /// </summary>
  /// <param name="colorProxies"></param>
  /// <param name="onOperationProgressed"></param>
-  public async Task ParseColors(List<ColorProxy> colorProxies, IProgress<CardProgress> onOperationProgressed)
+  public void ParseColors(List<ColorProxy> colorProxies, Action<string, double?>? onOperationProgressed)
  {
    // injected as Singleton, so we need to clean existing proxies first
    ObjectColorsIdMap = new();
    var count = 0;
    foreach (ColorProxy colorProxy in colorProxies)
    {
-      onOperationProgressed.Report(new("Converting colors", (double)++count / colorProxies.Count));
-      await Task.Yield();
+      onOperationProgressed?.Invoke("Converting colors", (double)++count / colorProxies.Count);
      foreach (string objectId in colorProxy.objects)
      {
        Color convertedColor = Color.FromArgb(colorProxy.value);
@@ -78,18 +76,14 @@ public class ArcGISColorManager
  /// </summary>
  /// <param name="materialProxies"></param>
  /// <param name="onOperationProgressed"></param>
-  public async Task ParseMaterials(
-    List<RenderMaterialProxy> materialProxies,
-    IProgress<CardProgress> onOperationProgressed
-  )
+  public void ParseMaterials(List<RenderMaterialProxy> materialProxies, Action<string, double?>? onOperationProgressed)
  {
    // injected as Singleton, so we need to clean existing proxies first
    ObjectMaterialsIdMap = new();
    var count = 0;
    foreach (RenderMaterialProxy colorProxy in materialProxies)
    {
-      onOperationProgressed.Report(new("Converting materials", (double)++count / materialProxies.Count));
-      await Task.Yield();
+      onOperationProgressed?.Invoke("Converting materials", (double)++count / materialProxies.Count);
      foreach (string objectId in colorProxy.objects)
      {
        Color convertedColor = Color.FromArgb(colorProxy.value.diffuse);
@@ -316,11 +310,6 @@ public class ArcGISColorManager
    int count = 1;
    using (RowCursor rowCursor = layer.Search())
    {
-      // if layer doesn't have a valid data source (and the conversion likely failed), don't create a colorProxy
-      if (rowCursor is null)
-      {
-        return;
-      }
      while (rowCursor.MoveNext())
      {
        string elementAppId = $"{layer.URI}_{count}";
@@ -456,11 +445,6 @@ public class ArcGISColorManager
    out int color
  )
  {
-    if (uniqueRenderer.DefaultSymbol is null)
-    {
-      color = RbgToInt(255, 255, 255, 255);
-      return false;
-    }
    if (!TryGetSymbolColor(uniqueRenderer.DefaultSymbol.Symbol, out color)) // get default color
    {
      return false;
@@ -503,11 +487,6 @@ public class ArcGISColorManager
        // set the group color to class symbol color if conditions are met
        if (groupConditionsMet)
        {
-          if (groupClass.Symbol is null)
-          {
-            color = RbgToInt(255, 255, 255, 255);
-            return false;
-          }
          if (!TryGetSymbolColor(groupClass.Symbol.Symbol, out color))
          {
            return false;
@@ -559,11 +538,6 @@ public class ArcGISColorManager
    out int color
  )
  {
-    if (graduatedRenderer.DefaultSymbol is null)
-    {
-      color = RbgToInt(255, 255, 255, 255);
-      return false;
-    }
    if (!TryGetSymbolColor(graduatedRenderer.DefaultSymbol.Symbol, out color)) // get default color
    {
      return false;
@@ -0,0 +1,9 @@
+using ArcGIS.Desktop.Framework.Threading.Tasks;
+using Speckle.Connectors.Common.Operations;
+
+namespace Speckle.Connectors.ArcGIS.HostApp;
+
+public class SyncToQueuedTask : ISyncToThread
+{
+  public Task<T> RunOnThread<T>(Func<T> func) => QueuedTask.Run(func);
+}
@@ -62,7 +62,7 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
    Base rootObject,
    string projectName,
    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed,
    CancellationToken cancellationToken
  )
  {
@@ -70,7 +70,7 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
    // ATM, GIS commit CRS is stored per layer (in FeatureClass converter), but should be moved to the Root level too

    // Prompt the UI conversion started. Progress bar will swoosh.
-    onOperationProgressed.Report(new("Converting", null));
+    onOperationProgressed?.Invoke("Converting", null);

    // get materials
    List<RenderMaterialProxy>? materials = (rootObject[ProxyKeys.RENDER_MATERIAL] as List<object>)
@@ -78,14 +78,14 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
      .ToList();
    if (materials != null)
    {
-      await _colorManager.ParseMaterials(materials, onOperationProgressed).ConfigureAwait(false);
+      _colorManager.ParseMaterials(materials, onOperationProgressed);
    }

    // get colors
    List<ColorProxy>? colors = (rootObject[ProxyKeys.COLOR] as List<object>)?.Cast<ColorProxy>().ToList();
    if (colors != null)
    {
-      await _colorManager.ParseColors(colors, onOperationProgressed).ConfigureAwait(false);
+      _colorManager.ParseColors(colors, onOperationProgressed);
    }

    int count = 0;
@@ -125,32 +125,24 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
      {
        results.Add(new(Status.ERROR, obj, null, null, ex));
      }
-      onOperationProgressed.Report(new("Converting", (double)++count / objectsToConvert.Count));
+      onOperationProgressed?.Invoke("Converting", (double)++count / objectsToConvert.Count);
    }

    // 2.1. Group conversionTrackers (to write into datasets)
-    onOperationProgressed.Report(new("Grouping features into layers", null));
+    onOperationProgressed?.Invoke("Grouping features into layers", null);
    Dictionary<string, List<(TraversalContext, ObjectConversionTracker)>> convertedGroups = await QueuedTask
-      .Run(async () =>
+      .Run(() =>
      {
-        return await _featureClassUtils
-          .GroupConversionTrackers(conversionTracker, (s, progres) => onOperationProgressed.Report(new(s, progres)))
-          .ConfigureAwait(false);
+        return _featureClassUtils.GroupConversionTrackers(conversionTracker, onOperationProgressed);
      })
      .ConfigureAwait(false);

    // 2.2. Write groups of objects to Datasets
-    onOperationProgressed.Report(new("Writing to Database", null));
+    onOperationProgressed?.Invoke("Writing to Database", null);
    await QueuedTask
-      .Run(async () =>
+      .Run(() =>
      {
-        await _featureClassUtils
-          .CreateDatasets(
-            conversionTracker,
-            convertedGroups,
-            (s, progres) => onOperationProgressed.Report(new(s, progres))
-          )
-          .ConfigureAwait(false);
+        _featureClassUtils.CreateDatasets(conversionTracker, convertedGroups, onOperationProgressed);
      })
      .ConfigureAwait(false);

@@ -161,7 +153,7 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder

    int bakeCount = 0;
    Dictionary<string, (MapMember, CIMUniqueValueRenderer?)> bakedMapMembers = new();
-    onOperationProgressed.Report(new("Adding to Map", bakeCount));
+    onOperationProgressed?.Invoke("Adding to Map", bakeCount);

    foreach (var item in conversionTracker)
    {
@@ -223,8 +215,7 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
        // add report item
        AddResultsFromTracker(trackerItem, results);
      }
-
-      onOperationProgressed.Report(new("Adding to Map", (double)++bakeCount / conversionTracker.Count));
+      onOperationProgressed?.Invoke("Adding to Map", (double)++bakeCount / conversionTracker.Count);
    }

    // apply renderers to baked layers
@@ -304,80 +295,78 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
    }
  }

-  private async Task<MapMember> AddDatasetsToMap(
+  private Task<MapMember> AddDatasetsToMap(
    ObjectConversionTracker trackerItem,
    Dictionary<string, GroupLayer> createdLayerGroups,
    string projectName,
    string modelName
  )
  {
-    return await QueuedTask
-      .Run(() =>
+    return QueuedTask.Run(() =>
+    {
+      // get layer details
+      string? datasetId = trackerItem.DatasetId; // should not be null here
+      Uri uri = new($"{_settingsStore.Current.SpeckleDatabasePath.AbsolutePath.Replace('/', '\\')}\\{datasetId}");
+      string nestedLayerName = trackerItem.NestedLayerName;
+
+      // add group for the current layer
+      string shortName = nestedLayerName.Split("\\")[^1];
+      string nestedLayerPath = string.Join("\\", nestedLayerName.Split("\\").SkipLast(1));
+
+      // if no general group layer found
+      if (createdLayerGroups.Count == 0)
      {
-        // get layer details
-        string? datasetId = trackerItem.DatasetId; // should not be null here
-        Uri uri = new($"{_settingsStore.Current.SpeckleDatabasePath.AbsolutePath.Replace('/', '\\')}\\{datasetId}");
-        string nestedLayerName = trackerItem.NestedLayerName;
+        Map map = _settingsStore.Current.Map;
+        GroupLayer mainGroupLayer = LayerFactory.Instance.CreateGroupLayer(map, 0, $"{projectName}: {modelName}");
+        mainGroupLayer.SetExpanded(true);
+        createdLayerGroups["Basic Speckle Group"] = mainGroupLayer; // key doesn't really matter here
+      }

-        // add group for the current layer
-        string shortName = nestedLayerName.Split("\\")[^1];
-        string nestedLayerPath = string.Join("\\", nestedLayerName.Split("\\").SkipLast(1));
+      var groupLayer = CreateNestedGroupLayer(nestedLayerPath, createdLayerGroups);

-        // if no general group layer found
-        if (createdLayerGroups.Count == 0)
+      // Most of the Speckle-written datasets will be containing geometry and added as Layers
+      // although, some datasets might be just tables (e.g. native GIS Tables, in the future maybe Revit schedules etc.
+      // We can create a connection to the dataset in advance and determine its type, but this will be more
+      // expensive, than assuming by default that it's a layer with geometry (which in most cases it's expected to be)
+      try
+      {
+        var layer = LayerFactory.Instance.CreateLayer(uri, groupLayer, layerName: shortName);
+        if (layer == null)
        {
-          Map map = _settingsStore.Current.Map;
-          GroupLayer mainGroupLayer = LayerFactory.Instance.CreateGroupLayer(map, 0, $"{projectName}: {modelName}");
-          mainGroupLayer.SetExpanded(true);
-          createdLayerGroups["Basic Speckle Group"] = mainGroupLayer; // key doesn't really matter here
+          throw new SpeckleException($"Layer '{shortName}' was not created");
        }
+        layer.SetExpanded(false);

-        var groupLayer = CreateNestedGroupLayer(nestedLayerPath, createdLayerGroups);
-
-        // Most of the Speckle-written datasets will be containing geometry and added as Layers
-        // although, some datasets might be just tables (e.g. native GIS Tables, in the future maybe Revit schedules etc.
-        // We can create a connection to the dataset in advance and determine its type, but this will be more
-        // expensive, than assuming by default that it's a layer with geometry (which in most cases it's expected to be)
-        try
+        // if Scene
+        // https://community.esri.com/t5/arcgis-pro-sdk-questions/sdk-equivalent-to-changing-layer-s-elevation/td-p/1346139
+        if (_settingsStore.Current.Map.IsScene)
        {
-          var layer = LayerFactory.Instance.CreateLayer(uri, groupLayer, layerName: shortName);
-          if (layer == null)
+          var groundSurfaceLayer = _settingsStore.Current.Map.GetGroundElevationSurfaceLayer();
+          var layerElevationSurface = new CIMLayerElevationSurface
          {
-            throw new SpeckleException($"Layer '{shortName}' was not created");
-          }
-          layer.SetExpanded(false);
+            ElevationSurfaceLayerURI = groundSurfaceLayer.URI,
+          };

-          // if Scene
-          // https://community.esri.com/t5/arcgis-pro-sdk-questions/sdk-equivalent-to-changing-layer-s-elevation/td-p/1346139
-          if (_settingsStore.Current.Map.IsScene)
+          // for Feature Layers
+          if (layer.GetDefinition() is CIMFeatureLayer cimLyr)
          {
-            var groundSurfaceLayer = _settingsStore.Current.Map.GetGroundElevationSurfaceLayer();
-            var layerElevationSurface = new CIMLayerElevationSurface
-            {
-              ElevationSurfaceLayerURI = groundSurfaceLayer.URI,
-            };
-
-            // for Feature Layers
-            if (layer.GetDefinition() is CIMFeatureLayer cimLyr)
-            {
-              cimLyr.LayerElevation = layerElevationSurface;
-              layer.SetDefinition(cimLyr);
-            }
+            cimLyr.LayerElevation = layerElevationSurface;
+            layer.SetDefinition(cimLyr);
          }
+        }

-          return (MapMember)layer;
-        }
-        catch (ArgumentException)
-        {
-          StandaloneTable table = StandaloneTableFactory.Instance.CreateStandaloneTable(
-            uri,
-            groupLayer,
-            tableName: shortName
-          );
-          return table;
-        }
-      })
-      .ConfigureAwait(false);
+        return (MapMember)layer;
+      }
+      catch (ArgumentException)
+      {
+        StandaloneTable table = StandaloneTableFactory.Instance.CreateStandaloneTable(
+          uri,
+          groupLayer,
+          tableName: shortName
+        );
+        return table;
+      }
+    });
  }

  private GroupLayer CreateNestedGroupLayer(string nestedLayerPath, Dictionary<string, GroupLayer> createdLayerGroups)
@@ -57,7 +57,7 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>
 #pragma warning restore CA1506
    IReadOnlyList<MapMember> objects,
    SendInfo sendInfo,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed = null,
    CancellationToken ct = default
  )
  {
@@ -71,7 +71,7 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>

    List<SendConversionResult> results = new(objects.Count);
    var cacheHitCount = 0;
-    List<(ILayerContainer, Collection)> nestedGroups = new();
+    List<(GroupLayer, Collection)> nestedGroups = new();

    // reorder selected layers by Table of Content (TOC) order
    List<(MapMember, int)> layersWithDisplayPriority = _mapMemberUtils.GetLayerDisplayPriority(
@@ -79,7 +79,7 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>
      objects
    );

-    onOperationProgressed.Report(new("Converting", null));
+    onOperationProgressed?.Invoke("Converting", null);
    using (var __ = _activityFactory.Start("Converting objects"))
    {
      foreach ((MapMember mapMember, _) in layersWithDisplayPriority)
@@ -112,7 +112,7 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>

            // don't use cache for group layers
            if (
-              mapMember is not ILayerContainer
+              mapMember is not GroupLayer
              && _sendConversionCache.TryGetValue(sendInfo.ProjectId, applicationId, out ObjectReference? value)
            )
            {
@@ -121,7 +121,7 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>
            }
            else
            {
-              if (mapMember is ILayerContainer group)
+              if (mapMember is GroupLayer group)
              {
                // group layer will always come before it's contained layers
                // keep active group last in the list
@@ -183,13 +183,13 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>
          }
        }

-        onOperationProgressed.Report(new("Converting", (double)++count / objects.Count));
+        onOperationProgressed?.Invoke("Converting", (double)++count / objects.Count);
      }
    }

    if (results.All(x => x.Status == Status.ERROR))
    {
-      throw new SpeckleException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
+      throw new SpeckleConversionException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
    }

    // POC: Add Color Proxies
@@ -1,3 +1,4 @@
+using ArcGIS.Desktop.Internal.Mapping;
 using ArcGIS.Desktop.Mapping;

 namespace Speckle.Connectors.ArcGIS.Utils;
@@ -27,13 +28,21 @@ public class MapMembersUtils
    List<MapMember> mapMembers = new();
    foreach (var layer in mapMembersToUnpack)
    {
-      mapMembers.Add(layer);
      switch (layer)
      {
-        case ILayerContainer subGroup:
-          var subLayerMapMembers = UnpackMapLayers(subGroup.Layers);
+        case GroupLayer subGroup:
+          mapMembers.Add(layer);
+          var subGroupMapMembers = UnpackMapLayers(subGroup.Layers);
+          mapMembers.AddRange(subGroupMapMembers);
+          break;
+        case ILayerContainerInternal subLayerContainerInternal:
+          mapMembers.Add(layer);
+          var subLayerMapMembers = UnpackMapLayers(subLayerContainerInternal.InternalLayers);
          mapMembers.AddRange(subLayerMapMembers);
          break;
+        default:
+          mapMembers.Add(layer);
+          break;
      }
    }

@@ -244,8 +244,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -253,7 +253,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -278,7 +278,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -310,18 +310,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -274,8 +274,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -283,7 +283,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -308,7 +308,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -346,18 +346,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -274,8 +274,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -283,7 +283,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -308,7 +308,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -346,18 +346,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -274,8 +274,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -283,7 +283,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -309,7 +309,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -347,18 +347,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -238,8 +238,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -247,7 +247,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -273,7 +273,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -311,18 +311,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -37,10 +37,10 @@ public class AutocadBasicConnectorBinding : IBasicConnectorBinding
    _speckleApplication = speckleApplication;
    Commands = new BasicConnectorBindingCommands(parent);
    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged().ConfigureAwait(false);
-      });
+    {
+      Commands.NotifyDocumentChanged();
+    };
+
    _logger = logger;
  }

@@ -72,17 +72,17 @@ public class AutocadBasicConnectorBinding : IBasicConnectorBinding

  public void RemoveModel(ModelCard model) => _store.RemoveModel(model);

-  public async Task HighlightObjects(IReadOnlyList<string> objectIds)
+  public void HighlightObjects(List<string> objectIds)
  {
    // POC: Will be addressed to move it into AutocadContext!
    var doc = Application.DocumentManager.MdiActiveDocument;

    var dbObjects = doc.GetObjects(objectIds);
    var acadObjectIds = dbObjects.Select(tuple => tuple.Root.Id).ToArray();
-    await HighlightObjectsOnView(acadObjectIds).ConfigureAwait(false);
+    HighlightObjectsOnView(acadObjectIds);
  }

-  public async Task HighlightModel(string modelCardId)
+  public void HighlightModel(string modelCardId)
  {
    // POC: Will be addressed to move it into AutocadContext!
    var doc = Application.DocumentManager.MdiActiveDocument;
@@ -116,78 +116,72 @@ public class AutocadBasicConnectorBinding : IBasicConnectorBinding

    if (objectIds.Length == 0)
    {
-      await Commands
-        .SetModelError(modelCardId, new OperationCanceledException("No objects found to highlight."))
-        .ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, new OperationCanceledException("No objects found to highlight."));
      return;
    }

-    await HighlightObjectsOnView(objectIds, modelCardId).ConfigureAwait(false);
+    HighlightObjectsOnView(objectIds, modelCardId);
  }

-  private async Task HighlightObjectsOnView(ObjectId[] objectIds, string? modelCardId = null)
+  private void HighlightObjectsOnView(ObjectId[] objectIds, string? modelCardId = null)
  {
    var doc = Application.DocumentManager.MdiActiveDocument;

-    await Parent
-      .RunOnMainThreadAsync(async () =>
+    Parent.RunOnMainThread(() =>
+    {
+      try
      {
+        doc.Editor.SetImpliedSelection(Array.Empty<ObjectId>()); // Deselects
        try
        {
-          doc.Editor.SetImpliedSelection(Array.Empty<ObjectId>()); // Deselects
+          doc.Editor.SetImpliedSelection(objectIds);
+        }
+        catch (Exception e) when (!e.IsFatal())
+        {
+          // SWALLOW REASON:
+          // If the objects under the blocks, it won't be able to select them.
+          // If we try, API will throw the invalid input error, because we request something from API that Autocad doesn't
+          // handle it on its current canvas. Block elements only selectable when in its scope.
+        }
+        doc.Editor.UpdateScreen();
+
+        Extents3d selectedExtents = new();
+
+        var tr = doc.TransactionManager.StartTransaction();
+        foreach (ObjectId objectId in objectIds)
+        {
          try
          {
-            doc.Editor.SetImpliedSelection(objectIds);
+            var entity = (Entity?)tr.GetObject(objectId, OpenMode.ForRead);
+            if (entity?.GeometricExtents != null)
+            {
+              selectedExtents.AddExtents(entity.GeometricExtents);
+            }
          }
          catch (Exception e) when (!e.IsFatal())
          {
-            // SWALLOW REASON:
-            // If the objects under the blocks, it won't be able to select them.
-            // If we try, API will throw the invalid input error, because we request something from API that Autocad doesn't
-            // handle it on its current canvas. Block elements only selectable when in its scope.
+            // Note: we're swallowing exeptions here because of a weird case when receiving blocks, we would have
+            // acad api throw an error on accessing entity.GeometricExtents.
          }
-          doc.Editor.UpdateScreen();
-
-          Extents3d selectedExtents = new();
-
-          var tr = doc.TransactionManager.StartTransaction();
-          foreach (ObjectId objectId in objectIds)
-          {
-            try
-            {
-              var entity = (Entity?)tr.GetObject(objectId, OpenMode.ForRead);
-              if (entity?.GeometricExtents != null)
-              {
-                selectedExtents.AddExtents(entity.GeometricExtents);
-              }
-            }
-            catch (Exception e) when (!e.IsFatal())
-            {
-              // Note: we're swallowing exeptions here because of a weird case when receiving blocks, we would have
-              // acad api throw an error on accessing entity.GeometricExtents.
-            }
-          }
-
-          doc.Editor.Zoom(selectedExtents);
-          tr.Commit();
-          Autodesk.AutoCAD.Internal.Utils.FlushGraphics();
        }
-        catch (Exception ex) when (!ex.IsFatal())
+
+        doc.Editor.Zoom(selectedExtents);
+        tr.Commit();
+        Autodesk.AutoCAD.Internal.Utils.FlushGraphics();
+      }
+      catch (Exception ex) when (!ex.IsFatal())
+      {
+        if (modelCardId != null)
        {
-          if (modelCardId != null)
-          {
-            await Commands
-              .SetModelError(modelCardId, new OperationCanceledException("Failed to highlight objects."))
-              .ConfigureAwait(false);
-          }
-          else
-          {
-            // This will happen, in some cases, where we highlight individual objects. Should be caught by the top level handler and not
-            // crash the host app.
-            throw;
-          }
+          Commands.SetModelError(modelCardId, new OperationCanceledException("Failed to highlight objects."));
        }
-      })
-      .ConfigureAwait(false);
+        else
+        {
+          // This will happen, in some cases, where we highlight individual objects. Should be caught by the top level handler and not
+          // crash the host app.
+          throw;
+        }
+      }
+    });
  }
 }
@@ -7,6 +7,7 @@ using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
+using Speckle.Connectors.DUI.Settings;
 using Speckle.Converters.Autocad;
 using Speckle.Converters.Common;
 using Speckle.Sdk;
@@ -50,6 +51,10 @@ public sealed class AutocadReceiveBinding : IReceiveBinding
    Commands = new ReceiveBindingUICommands(parent);
  }

+#pragma warning disable CA1024
+  public List<ICardSetting> GetReceiveSettings() => [];
+#pragma warning restore CA1024
+
  public void CancelReceive(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);

  public async Task Receive(string modelCardId)
@@ -79,14 +84,18 @@ public sealed class AutocadReceiveBinding : IReceiveBinding
        .ServiceProvider.GetRequiredService<ReceiveOperation>()
        .Execute(
          modelCard.GetReceiveInfo(_speckleApplication.Slug),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
-          cancellationToken
+          cancellationToken,
+          (status, progress) =>
+            _operationProgressManager.SetModelProgress(
+              Parent,
+              modelCardId,
+              new ModelCardProgress(modelCardId, status, progress),
+              cancellationToken
+            )
        )
        .ConfigureAwait(false);

-      await Commands
-        .SetModelReceiveResult(modelCardId, operationResults.BakedObjectIds, operationResults.ConversionResults)
-        .ConfigureAwait(false);
+      Commands.SetModelReceiveResult(modelCardId, operationResults.BakedObjectIds, operationResults.ConversionResults);
    }
    catch (OperationCanceledException)
    {
@@ -98,7 +107,7 @@ public sealed class AutocadReceiveBinding : IReceiveBinding
    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
    {
      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, ex);
    }
    finally
    {
@@ -41,9 +41,7 @@ public class AutocadSelectionBinding : ISelectionBinding
    if (!_visitedDocuments.Contains(document))
    {
      document.ImpliedSelectionChanged += (_, _) =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await Parent.RunOnMainThreadAsync(OnSelectionChanged).ConfigureAwait(false)
-        );
+        _topLevelExceptionHandler.CatchUnhandled(() => Parent.RunOnMainThread(OnSelectionChanged));

      _visitedDocuments.Add(document);
    }
@@ -54,10 +52,10 @@ public class AutocadSelectionBinding : ISelectionBinding
  // 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 void OnSelectionChanged()
  {
    _selectionInfo = GetSelectionInternal();
-    await Parent.Send(SELECTION_EVENT, _selectionInfo).ConfigureAwait(false);
+    Parent.Send(SELECTION_EVENT, _selectionInfo);
  }

  public SelectionInfo GetSelection() => _selectionInfo;
@@ -1,215 +0,0 @@
-using System.Collections.Concurrent;
-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.Common.Caching;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
-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.Sdk;
-using Speckle.Sdk.Common;
-
-namespace Speckle.Connectors.Autocad.Bindings;
-
-public abstract class AutocadSendBaseBinding : ISendBinding
-{
-  public string Name => "sendBinding";
-  public SendBindingUICommands Commands { get; }
-  private OperationProgressManager OperationProgressManager { get; }
-  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;
-
-  /// <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:
-  /// [CNX-202: Unhandled Exception Occurred when receiving in Rhino](https://linear.app/speckle/issue/CNX-202/unhandled-exception-occurred-when-receiving-in-rhino)
-  /// As to why a concurrent dictionary, it's because it's the cheapest/easiest way to do so.
-  /// https://stackoverflow.com/questions/18922985/concurrent-hashsett-in-net-framework
-  /// </summary>
-  private ConcurrentDictionary<string, byte> ChangedObjectIds { get; set; } = new();
-
-  protected AutocadSendBaseBinding(
-    DocumentModelStore store,
-    IAutocadIdleManager idleManager,
-    IBrowserBridge parent,
-    IEnumerable<ISendFilter> sendFilters,
-    CancellationManager cancellationManager,
-    IServiceProvider serviceProvider,
-    ISendConversionCache sendConversionCache,
-    IOperationProgressManager operationProgressManager,
-    ILogger<AutocadSendBinding> logger,
-    ISpeckleApplication speckleApplication
-  )
-  {
-    _store = store;
-    _idleManager = idleManager;
-    _serviceProvider = serviceProvider;
-    _cancellationManager = cancellationManager;
-    _sendFilters = sendFilters.ToList();
-    _sendConversionCache = sendConversionCache;
-    _operationProgressManager = operationProgressManager;
-    _logger = logger;
-    _speckleApplication = speckleApplication;
-    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
-    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);
-    }
-    // Since ids of the objects generates from same seed, we should clear the cache always whenever doc swapped.
-    _store.DocumentChanged += (_, _) =>
-    {
-      _sendConversionCache.ClearCache();
-    };
-  }
-
-  private readonly List<string> _docSubsTracker = new();
-
-  private void SubscribeToObjectChanges(Document doc)
-  {
-    if (doc == null || doc.Database == null || _docSubsTracker.Contains(doc.Name))
-    {
-      return;
-    }
-
-    _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);
-  }
-
-  private void OnObjectChanged(DBObject dbObject)
-  {
-    _topLevelExceptionHandler.CatchUnhandled(() => OnChangeChangedObjectIds(dbObject));
-  }
-
-  private void OnChangeChangedObjectIds(DBObject dBObject)
-  {
-    ChangedObjectIds[dBObject.GetSpeckleApplicationId()] = 1;
-    _idleManager.SubscribeToIdle(nameof(AutocadSendBinding), RunExpirationChecks);
-  }
-
-  private void RunExpirationChecks()
-  {
-    var senders = _store.GetSenders();
-    string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
-    List<string> expiredSenderIds = new();
-
-    _sendConversionCache.EvictObjects(objectIdsList);
-
-    foreach (SenderModelCard modelCard in senders)
-    {
-      var intersection = modelCard.SendFilter.NotNull().GetObjectIds().Intersect(objectIdsList).ToList();
-      bool isExpired = intersection.Count != 0;
-      if (isExpired)
-      {
-        expiredSenderIds.Add(modelCard.ModelCardId.NotNull());
-      }
-    }
-
-    Commands.SetModelsExpired(expiredSenderIds);
-    ChangedObjectIds = new();
-  }
-
-  public List<ISendFilter> GetSendFilters() => _sendFilters;
-
-  public List<ICardSetting> GetSendSettings() => [];
-
-  public async Task Send(string modelCardId) =>
-    await Parent
-      .RunOnMainThreadAsync(async () => await SendInternal(modelCardId).ConfigureAwait(false))
-      .ConfigureAwait(false);
-
-  protected abstract void InitializeSettings(IServiceProvider serviceProvider);
-
-  private async Task SendInternal(string modelCardId)
-  {
-    try
-    {
-      if (_store.GetModelById(modelCardId) is not SenderModelCard modelCard)
-      {
-        // Handle as GLOBAL ERROR at BrowserBridge
-        throw new InvalidOperationException("No publish model card was found.");
-      }
-
-      using var scope = _serviceProvider.CreateScope();
-      InitializeSettings(scope.ServiceProvider);
-
-      CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
-
-      // Disable document activation (document creation and document switch)
-      // Not disabling results in DUI model card being out of sync with the active document
-      // The DocumentActivated event isn't usable probably because it is pushed to back of main thread queue
-      Application.DocumentManager.DocumentActivationEnabled = false;
-
-      // Get elements to convert
-      List<AutocadRootObject> autocadObjects = Application.DocumentManager.CurrentDocument.GetObjects(
-        modelCard.SendFilter.NotNull().GetObjectIds()
-      );
-
-      if (autocadObjects.Count == 0)
-      {
-        // Handle as CARD ERROR in this function
-        throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
-      }
-
-      var sendResult = await scope
-        .ServiceProvider.GetRequiredService<SendOperation<AutocadRootObject>>()
-        .Execute(
-          autocadObjects,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
-          cancellationToken
-        )
-        .ConfigureAwait(false);
-
-      await Commands
-        .SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults)
-        .ConfigureAwait(false);
-    }
-    catch (OperationCanceledException)
-    {
-      // SWALLOW -> UI handles it immediately, so we do not need to handle anything for now!
-      // Idea for later -> when cancel called, create promise from UI to solve it later with this catch block.
-      // So have 3 state on UI -> Cancellation clicked -> Cancelling -> Cancelled
-      return;
-    }
-    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
-    {
-      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
-    }
-    finally
-    {
-      // renable document activation
-      Application.DocumentManager.DocumentActivationEnabled = true;
-    }
-  }
-
-  public void CancelSend(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
-}
@@ -1,21 +1,54 @@
+using System.Collections.Concurrent;
+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.Common.Caching;
 using Speckle.Connectors.Common.Cancellation;
+using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+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.Converters.Autocad;
 using Speckle.Converters.Common;
 using Speckle.Sdk;
+using Speckle.Sdk.Common;

 namespace Speckle.Connectors.Autocad.Bindings;

-public sealed class AutocadSendBinding : AutocadSendBaseBinding
+public sealed class AutocadSendBinding : ISendBinding
 {
+  public string Name => "sendBinding";
+  public SendBindingUICommands Commands { get; }
+  private OperationProgressManager OperationProgressManager { get; }
+  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 IAutocadConversionSettingsFactory _autocadConversionSettingsFactory;
+  private readonly ISpeckleApplication _speckleApplication;
+
+  /// <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:
+  /// [CNX-202: Unhandled Exception Occurred when receiving in Rhino](https://linear.app/speckle/issue/CNX-202/unhandled-exception-occurred-when-receiving-in-rhino)
+  /// As to why a concurrent dictionary, it's because it's the cheapest/easiest way to do so.
+  /// https://stackoverflow.com/questions/18922985/concurrent-hashsett-in-net-framework
+  /// </summary>
+  private ConcurrentDictionary<string, byte> ChangedObjectIds { get; set; } = new();

  public AutocadSendBinding(
    DocumentModelStore store,
@@ -30,26 +63,163 @@ public sealed class AutocadSendBinding : AutocadSendBaseBinding
    IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
    ISpeckleApplication speckleApplication
  )
-    : base(
-      store,
-      idleManager,
-      parent,
-      sendFilters,
-      cancellationManager,
-      serviceProvider,
-      sendConversionCache,
-      operationProgressManager,
-      logger,
-      speckleApplication
-    )
  {
+    _store = store;
+    _idleManager = idleManager;
+    _serviceProvider = serviceProvider;
+    _cancellationManager = cancellationManager;
+    _sendFilters = sendFilters.ToList();
+    _sendConversionCache = sendConversionCache;
+    _operationProgressManager = operationProgressManager;
+    _logger = logger;
    _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
+    _speckleApplication = speckleApplication;
+    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
+    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);
+    }
+    // Since ids of the objects generates from same seed, we should clear the cache always whenever doc swapped.
+    _store.DocumentChanged += (_, _) =>
+    {
+      _sendConversionCache.ClearCache();
+    };
  }

-  protected override void InitializeSettings(IServiceProvider serviceProvider)
+  private readonly List<string> _docSubsTracker = new();
+
+  private void SubscribeToObjectChanges(Document doc)
  {
-    serviceProvider
-      .GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
-      .Initialize(_autocadConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
+    if (doc == null || doc.Database == null || _docSubsTracker.Contains(doc.Name))
+    {
+      return;
+    }
+
+    _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);
  }
+
+  private void OnObjectChanged(DBObject dbObject)
+  {
+    _topLevelExceptionHandler.CatchUnhandled(() => OnChangeChangedObjectIds(dbObject));
+  }
+
+  private void OnChangeChangedObjectIds(DBObject dBObject)
+  {
+    ChangedObjectIds[dBObject.GetSpeckleApplicationId()] = 1;
+    _idleManager.SubscribeToIdle(nameof(AutocadSendBinding), RunExpirationChecks);
+  }
+
+  private void RunExpirationChecks()
+  {
+    var senders = _store.GetSenders();
+    string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
+    List<string> expiredSenderIds = new();
+
+    _sendConversionCache.EvictObjects(objectIdsList);
+
+    foreach (SenderModelCard modelCard in senders)
+    {
+      var intersection = modelCard.SendFilter.NotNull().GetObjectIds().Intersect(objectIdsList).ToList();
+      bool isExpired = intersection.Count != 0;
+      if (isExpired)
+      {
+        expiredSenderIds.Add(modelCard.ModelCardId.NotNull());
+      }
+    }
+
+    Commands.SetModelsExpired(expiredSenderIds);
+    ChangedObjectIds = new();
+  }
+
+  public List<ISendFilter> GetSendFilters() => _sendFilters;
+
+  public List<ICardSetting> GetSendSettings() => [];
+
+  public Task Send(string modelCardId)
+  {
+    Parent.RunOnMainThread(async () => await SendInternal(modelCardId).ConfigureAwait(false));
+    return Task.CompletedTask;
+  }
+
+  private async Task SendInternal(string modelCardId)
+  {
+    try
+    {
+      if (_store.GetModelById(modelCardId) is not SenderModelCard modelCard)
+      {
+        // Handle as GLOBAL ERROR at BrowserBridge
+        throw new InvalidOperationException("No publish model card was found.");
+      }
+
+      using var scope = _serviceProvider.CreateScope();
+      scope
+        .ServiceProvider.GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
+        .Initialize(_autocadConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
+
+      CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
+
+      // Disable document activation (document creation and document switch)
+      // Not disabling results in DUI model card being out of sync with the active document
+      // The DocumentActivated event isn't usable probably because it is pushed to back of main thread queue
+      Application.DocumentManager.DocumentActivationEnabled = false;
+
+      // Get elements to convert
+      List<AutocadRootObject> autocadObjects = Application.DocumentManager.CurrentDocument.GetObjects(
+        modelCard.SendFilter.NotNull().GetObjectIds()
+      );
+
+      if (autocadObjects.Count == 0)
+      {
+        // Handle as CARD ERROR in this function
+        throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
+      }
+
+      var sendResult = await scope
+        .ServiceProvider.GetRequiredService<SendOperation<AutocadRootObject>>()
+        .Execute(
+          autocadObjects,
+          modelCard.GetSendInfo(_speckleApplication.Slug),
+          (status, progress) =>
+            _operationProgressManager.SetModelProgress(
+              Parent,
+              modelCardId,
+              new ModelCardProgress(modelCardId, status, progress),
+              cancellationToken
+            ),
+          cancellationToken
+        )
+        .ConfigureAwait(false);
+
+      Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
+    }
+    catch (OperationCanceledException)
+    {
+      // SWALLOW -> UI handles it immediately, so we do not need to handle anything for now!
+      // Idea for later -> when cancel called, create promise from UI to solve it later with this catch block.
+      // So have 3 state on UI -> Cancellation clicked -> Cancelling -> Cancelled
+      return;
+    }
+    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
+    {
+      _logger.LogModelCardHandledError(ex);
+      Commands.SetModelError(modelCardId, ex);
+    }
+    finally
+    {
+      // renable document activation
+      Application.DocumentManager.DocumentActivationEnabled = true;
+    }
+  }
+
+  public void CancelSend(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
 }
@@ -1,11 +1,5 @@
 #if AUTOCAD
-using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Autocad.Bindings;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.DUI.Bindings;
-using Speckle.Sdk;

 namespace Speckle.Connectors.Autocad.DependencyInjection;

@@ -15,16 +9,9 @@ public static class AutocadConnectorModule
  {
    serviceCollection.AddAutocadBase();

-    // Send
+    // Operations
    serviceCollection.LoadSend();
-    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, AutocadRootObjectBuilder>();
-
-    // Receive
    serviceCollection.LoadReceive();
-
-    // Register vertical specific bindings
-    serviceCollection.AddSingleton<IBinding, AutocadSendBinding>();
-    serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly());
  }
 }
 #endif
@@ -1,7 +1,5 @@
 #if CIVIL3D
 using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common.Builders;

 namespace Speckle.Connectors.Autocad.DependencyInjection;

@@ -10,10 +8,7 @@ public static class Civil3dConnectorModule
  public static void AddCivil3d(this IServiceCollection serviceCollection)
  {
    serviceCollection.AddAutocadBase();
-
-    // send
    serviceCollection.LoadSend();
-    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, Civil3dRootObjectBuilder>();
  }
 }
 #endif
@@ -12,7 +12,6 @@ using Speckle.Connectors.Common.Instances;
 using Speckle.Connectors.Common.Operations;
 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;
@@ -50,7 +49,7 @@ public static class SharedRegistration
    serviceCollection.AddScoped<AutocadMaterialUnpacker>();
    serviceCollection.AddScoped<AutocadMaterialBaker>();

-    serviceCollection.AddSingleton<IAppIdleManager, AutocadIdleManager>();
+    serviceCollection.AddSingleton<IAutocadIdleManager, AutocadIdleManager>();

    // operation progress manager
    serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
@@ -71,6 +70,12 @@ public static class SharedRegistration
    // Operations
    serviceCollection.AddScoped<SendOperation<AutocadRootObject>>();

+    // Object Builders
+    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, AutocadRootObjectBuilder>();
+
+    // Register bindings
+    serviceCollection.AddSingleton<IBinding, AutocadSendBinding>();
+
    // register send filters
    serviceCollection.AddTransient<ISendFilter, AutocadSelectionFilter>();

@@ -1,6 +1,5 @@
 using Autodesk.AutoCAD.Colors;
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Sdk;
 using Speckle.Sdk.Models.Proxies;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;
@@ -29,17 +28,14 @@ public class AutocadColorBaker
  /// </summary>
  /// <param name="colorProxies"></param>
  /// <param name="onOperationProgressed"></param>
-  public async Task ParseColors(
-    IReadOnlyCollection<ColorProxy> colorProxies,
-    IProgress<CardProgress> onOperationProgressed
-  )
+  public void ParseColors(List<ColorProxy> colorProxies, Action<string, double?>? onOperationProgressed)
  {
    var count = 0;
    foreach (ColorProxy colorProxy in colorProxies)
    {
      try
      {
-        onOperationProgressed.Report(new("Converting colors", (double)++count / colorProxies.Count));
+        onOperationProgressed?.Invoke("Converting colors", (double)++count / colorProxies.Count);

        // skip any colors with source = layer, since object color default source is by layer
        if (colorProxy["source"] is string source && source == "layer")
@@ -64,8 +60,6 @@ public class AutocadColorBaker
      {
        _logger.LogError(ex, "Failed parsing color proxy");
      }
-
-      await Task.Yield();
    }
  }

@@ -3,20 +3,23 @@ using Speckle.InterfaceGenerator;

 namespace Speckle.Connectors.Autocad.HostApp;

-public partial interface IAutocadIdleManager : IAppIdleManager;
-
 [GenerateAutoInterface]
-public sealed class AutocadIdleManager(IIdleCallManager idleCallManager)
-  : AppIdleManager(idleCallManager),
-    IAutocadIdleManager
+public class AutocadIdleManager(IIdleCallManager idleCallManager) : IAutocadIdleManager
 {
-  private readonly IIdleCallManager _idleCallManager = idleCallManager;
-
-  protected override void AddEvent()
-  {
-    Application.Idle += AutocadAppOnIdle;
-  }
+  /// <summary>
+  /// Subscribe deferred action to AutocadIdle event to run it whenever Autocad become idle.
+  /// </summary>
+  /// <param name="action"> Action to call whenever Autocad become Idle.</param>
+  public void SubscribeToIdle(string id, Action action) =>
+    idleCallManager.SubscribeToIdle(
+      id,
+      action,
+      () =>
+      {
+        Application.Idle += AutocadAppOnIdle;
+      }
+    );

  private void AutocadAppOnIdle(object? sender, EventArgs e) =>
-    _idleCallManager.AppOnIdle(() => Application.Idle -= AutocadAppOnIdle);
+    idleCallManager.AppOnIdle(() => Application.Idle -= AutocadAppOnIdle);
 }
@@ -1,17 +1,14 @@
-using System.Diagnostics.CodeAnalysis;
 using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.Geometry;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Converters.Autocad;
 using Speckle.Converters.Common;
 using Speckle.DoubleNumerics;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
-using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
@@ -48,12 +45,11 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
    _converterSettings = converterSettings;
  }

-  [SuppressMessage("Maintainability", "CA1506:Avoid excessive class coupling")]
-  public async Task<BakeResult> BakeInstances(
-    IReadOnlyCollection<(Collection[] collectionPath, IInstanceComponent obj)> instanceComponents,
+  public BakeResult BakeInstances(
+    List<(Collection[] collectionPath, IInstanceComponent obj)> instanceComponents,
    Dictionary<string, List<Entity>> applicationIdMap,
    string baseLayerName,
-    IProgress<CardProgress> onOperationProgressed
+    Action<string, double?>? onOperationProgressed
  )
  {
    var sortedInstanceComponents = instanceComponents
@@ -73,8 +69,7 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
    {
      try
      {
-        onOperationProgressed.Report(new("Converting blocks", (double)++count / sortedInstanceComponents.Count));
-
+        onOperationProgressed?.Invoke("Converting blocks", (double)++count / sortedInstanceComponents.Count);
        if (instanceOrDefinition is InstanceDefinitionProxy { applicationId: not null } definitionProxy)
        {
          // TODO: create definition (block table record)
@@ -167,7 +162,6 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
    }

    transaction.Commit();
-    await Task.Yield();
    return new(createdObjectIds, consumedObjectIds, conversionResults);
  }

@@ -1,6 +1,6 @@
-using Autodesk.AutoCAD.DatabaseServices;
+using Autodesk.AutoCAD.DatabaseServices;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Sdk;
+using Speckle.Converters.Common;
 using Speckle.Sdk.Models.Collections;

 namespace Speckle.Connectors.Autocad.HostApp;
@@ -19,12 +19,14 @@ public class AutocadLayerUnpacker
    }
    if (tr.GetObject(entity.LayerId, OpenMode.ForRead) is LayerTableRecord autocadLayer)
    {
+      // Layers and geometries can have same application ids.....
+      // We should prevent it for sketchup converter. Because when it happens "objects_to_bake" definition
+      // is changing on the way if it happens.
      speckleLayer = new Layer(layerName) { applicationId = autocadLayer.GetSpeckleApplicationId() }; // Do not use handle directly, see note in the 'GetSpeckleApplicationId' method
      _layerCollectionCache[layerName] = speckleLayer;
      layer = autocadLayer;
      return speckleLayer;
    }
-
-    throw new SpeckleException("Unexpected condition in GetOrCreateSpeckleLayer");
+    throw new SpeckleConversionException("Unexpected condition in GetOrCreateSpeckleLayer");
  }
 }
@@ -3,7 +3,6 @@ using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.GraphicsInterface;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Objects.Other;
 using Speckle.Sdk;
 using Speckle.Sdk.Models;
@@ -91,10 +90,10 @@ public class AutocadMaterialBaker
    transaction.Commit();
  }

-  public async Task ParseAndBakeRenderMaterials(
+  public void ParseAndBakeRenderMaterials(
    List<RenderMaterialProxy> materialProxies,
    string baseLayerPrefix,
-    IProgress<CardProgress> onOperationProgressed
+    Action<string, double?>? onOperationProgressed
  )
  {
    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
@@ -110,7 +109,7 @@ public class AutocadMaterialBaker
    var count = 0;
    foreach (RenderMaterialProxy materialProxy in materialProxies)
    {
-      onOperationProgressed.Report(new("Converting render materials", (double)++count / materialProxies.Count));
+      onOperationProgressed?.Invoke("Converting render materials", (double)++count / materialProxies.Count);

      // bake render material
      RenderMaterial renderMaterial = materialProxy.value;
@@ -140,7 +139,6 @@ public class AutocadMaterialBaker
    }

    transaction.Commit();
-    await Task.Yield();
  }

  private (ObjectId, ReceiveConversionResult) BakeMaterial(
@@ -52,127 +52,118 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
    _rootObjectUnpacker = rootObjectUnpacker;
  }

-  public async Task<HostObjectBuilderResult> Build(
+  public Task<HostObjectBuilderResult> Build(
    Base rootObject,
    string projectName,
    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed,
    CancellationToken _
-  )
-  {
+  ) =>
    // NOTE: This is the only place we apply ISyncToThread across connectors. We need to sync up with main thread here
    //  after GetObject and Deserialization. It is anti-pattern now. Happiness level 3/10 but works.
-    return await _syncToThread
-      .RunOnThread(
-        async () => await BuildImpl(rootObject, projectName, modelName, onOperationProgressed).ConfigureAwait(false)
-      )
-      .ConfigureAwait(false);
-  }
-
-  private async Task<HostObjectBuilderResult> BuildImpl(
-    Base rootObject,
-    string projectName,
-    string modelName,
-    IProgress<CardProgress> onOperationProgressed
-  )
-  {
-    // Prompt the UI conversion started. Progress bar will swoosh.
-    onOperationProgressed.Report(new("Converting", null));
-
-    // Layer filter for received commit with project and model name
-    _layerBaker.CreateLayerFilter(projectName, modelName);
-
-    // 0 - Clean then Rock n Roll!
-    string baseLayerPrefix = _autocadContext.RemoveInvalidChars($"SPK-{projectName}-{modelName}-");
-    PreReceiveDeepClean(baseLayerPrefix);
-
-    // 1 - Unpack objects and proxies from root commit object
-    var unpackedRoot = _rootObjectUnpacker.Unpack(rootObject);
-
-    // 2 - Split atomic objects and instance components with their path
-    var (atomicObjects, instanceComponents) = _rootObjectUnpacker.SplitAtomicObjectsAndInstances(
-      unpackedRoot.ObjectsToConvert
-    );
-    var atomicObjectsWithPath = _layerBaker.GetAtomicObjectsWithPath(atomicObjects);
-    var instanceComponentsWithPath = _layerBaker.GetInstanceComponentsWithPath(instanceComponents);
-
-    // POC: these are not captured by traversal, so we need to re-add them here
-    if (unpackedRoot.DefinitionProxies != null && unpackedRoot.DefinitionProxies.Count > 0)
+    _syncToThread.RunOnThread(() =>
    {
-      var transformed = unpackedRoot.DefinitionProxies.Select(proxy =>
-        (Array.Empty<Collection>(), proxy as IInstanceComponent)
+      // Prompt the UI conversion started. Progress bar will swoosh.
+      onOperationProgressed?.Invoke("Converting", null);
+
+      // Layer filter for received commit with project and model name
+      _layerBaker.CreateLayerFilter(projectName, modelName);
+
+      // 0 - Clean then Rock n Roll!
+      string baseLayerPrefix = _autocadContext.RemoveInvalidChars($"SPK-{projectName}-{modelName}-");
+      PreReceiveDeepClean(baseLayerPrefix);
+
+      // 1 - Unpack objects and proxies from root commit object
+      var unpackedRoot = _rootObjectUnpacker.Unpack(rootObject);
+
+      // 2 - Split atomic objects and instance components with their path
+      var (atomicObjects, instanceComponents) = _rootObjectUnpacker.SplitAtomicObjectsAndInstances(
+        unpackedRoot.ObjectsToConvert
      );
-      instanceComponentsWithPath.AddRange(transformed);
-    }
+      var atomicObjectsWithPath = _layerBaker.GetAtomicObjectsWithPath(atomicObjects);
+      var instanceComponentsWithPath = _layerBaker.GetInstanceComponentsWithPath(instanceComponents);

-    // 3 - Bake materials and colors, as they are used later down the line by layers and objects
-    if (unpackedRoot.RenderMaterialProxies != null)
-    {
-      await _materialBaker
-        .ParseAndBakeRenderMaterials(unpackedRoot.RenderMaterialProxies, baseLayerPrefix, onOperationProgressed)
-        .ConfigureAwait(true);
-    }
-
-    if (unpackedRoot.ColorProxies != null)
-    {
-      await _colorBaker.ParseColors(unpackedRoot.ColorProxies, onOperationProgressed).ConfigureAwait(true);
-    }
-
-    // 5 - Convert atomic objects
-    List<ReceiveConversionResult> results = new();
-    List<string> bakedObjectIds = new();
-    Dictionary<string, List<Entity>> applicationIdMap = new();
-    var count = 0;
-    foreach (var (layerPath, atomicObject) in atomicObjectsWithPath)
-    {
-      string objectId = atomicObject.applicationId ?? atomicObject.id;
-      onOperationProgressed.Report(new("Converting objects", (double)++count / atomicObjects.Count));
-      try
+      // POC: these are not captured by traversal, so we need to re-add them here
+      if (unpackedRoot.DefinitionProxies != null && unpackedRoot.DefinitionProxies.Count > 0)
      {
-        List<Entity> convertedObjects = await ConvertObject(atomicObject, layerPath, baseLayerPrefix)
-          .ConfigureAwait(true);
-
-        applicationIdMap[objectId] = convertedObjects;
-
-        results.AddRange(
-          convertedObjects.Select(e => new ReceiveConversionResult(
-            Status.SUCCESS,
-            atomicObject,
-            e.GetSpeckleApplicationId(),
-            e.GetType().ToString()
-          ))
+        var transformed = unpackedRoot.DefinitionProxies.Select(proxy =>
+          (Array.Empty<Collection>(), proxy as IInstanceComponent)
        );
-
-        bakedObjectIds.AddRange(convertedObjects.Select(e => e.GetSpeckleApplicationId()));
+        instanceComponentsWithPath.AddRange(transformed);
      }
-      catch (Exception ex) when (!ex.IsFatal())
+
+      // 3 - Bake materials and colors, as they are used later down the line by layers and objects
+      if (unpackedRoot.RenderMaterialProxies != null)
      {
-        results.Add(new(Status.ERROR, atomicObject, null, null, ex));
+        _materialBaker.ParseAndBakeRenderMaterials(
+          unpackedRoot.RenderMaterialProxies,
+          baseLayerPrefix,
+          onOperationProgressed
+        );
      }
-    }

-    // 6 - Convert instances
-    var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = await _instanceBaker
-      .BakeInstances(instanceComponentsWithPath, applicationIdMap, baseLayerPrefix, onOperationProgressed)
-      .ConfigureAwait(true);
+      if (unpackedRoot.ColorProxies != null)
+      {
+        _colorBaker.ParseColors(unpackedRoot.ColorProxies, onOperationProgressed);
+      }

-    bakedObjectIds.RemoveAll(id => consumedObjectIds.Contains(id));
-    bakedObjectIds.AddRange(createdInstanceIds);
-    results.RemoveAll(result => result.ResultId != null && consumedObjectIds.Contains(result.ResultId));
-    results.AddRange(instanceConversionResults);
+      // 5 - Convert atomic objects
+      List<ReceiveConversionResult> results = new();
+      List<string> bakedObjectIds = new();
+      Dictionary<string, List<Entity>> applicationIdMap = new();
+      var count = 0;
+      foreach (var (layerPath, atomicObject) in atomicObjectsWithPath)
+      {
+        string objectId = atomicObject.applicationId ?? atomicObject.id;
+        onOperationProgressed?.Invoke("Converting objects", (double)++count / atomicObjects.Count);
+        try
+        {
+          List<Entity> convertedObjects = ConvertObject(atomicObject, layerPath, baseLayerPrefix).ToList();

-    // 7 - Create groups
-    if (unpackedRoot.GroupProxies != null)
-    {
-      List<ReceiveConversionResult> groupResults = _groupBaker.CreateGroups(
-        unpackedRoot.GroupProxies,
-        applicationIdMap
+          applicationIdMap[objectId] = convertedObjects;
+
+          results.AddRange(
+            convertedObjects.Select(e => new ReceiveConversionResult(
+              Status.SUCCESS,
+              atomicObject,
+              e.GetSpeckleApplicationId(),
+              e.GetType().ToString()
+            ))
+          );
+
+          bakedObjectIds.AddRange(convertedObjects.Select(e => e.GetSpeckleApplicationId()));
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+          results.Add(new(Status.ERROR, atomicObject, null, null, ex));
+        }
+      }
+
+      // 6 - Convert instances
+      var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = _instanceBaker.BakeInstances(
+        instanceComponentsWithPath,
+        applicationIdMap,
+        baseLayerPrefix,
+        onOperationProgressed
      );
-      results.AddRange(groupResults);
-    }

-    return new HostObjectBuilderResult(bakedObjectIds, results);
-  }
+      bakedObjectIds.RemoveAll(id => consumedObjectIds.Contains(id));
+      bakedObjectIds.AddRange(createdInstanceIds);
+      results.RemoveAll(result => result.ResultId != null && consumedObjectIds.Contains(result.ResultId));
+      results.AddRange(instanceConversionResults);
+
+      // 7 - Create groups
+      if (unpackedRoot.GroupProxies != null)
+      {
+        List<ReceiveConversionResult> groupResults = _groupBaker.CreateGroups(
+          unpackedRoot.GroupProxies,
+          applicationIdMap
+        );
+        results.AddRange(groupResults);
+      }
+
+      return new HostObjectBuilderResult(bakedObjectIds, results);
+    });

  private void PreReceiveDeepClean(string baseLayerPrefix)
  {
@@ -181,7 +172,7 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
    _materialBaker.PurgeMaterials(baseLayerPrefix);
  }

-  private async Task<List<Entity>> ConvertObject(Base obj, Collection[] layerPath, string baseLayerNamePrefix)
+  private IEnumerable<Entity> ConvertObject(Base obj, Collection[] layerPath, string baseLayerNamePrefix)
  {
    string layerName = _layerBaker.CreateLayerForReceive(layerPath, baseLayerNamePrefix);
    var convertedEntities = new List<Entity>();
@@ -204,7 +195,6 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
    }

    tr.Commit();
-    await Task.Delay(10).ConfigureAwait(true);
    return convertedEntities;
  }

@@ -1,192 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Extensions;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.Common;
-using Speckle.Sdk;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Models.Instances;
-
-namespace Speckle.Connectors.Autocad.Operations.Send;
-
-public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadRootObject>
-{
-  private readonly IRootToSpeckleConverter _converter;
-  private readonly string[] _documentPathSeparator = ["\\"];
-  private readonly ISendConversionCache _sendConversionCache;
-  private readonly AutocadInstanceUnpacker _instanceUnpacker;
-  private readonly AutocadMaterialUnpacker _materialUnpacker;
-  private readonly AutocadColorUnpacker _colorUnpacker;
-  private readonly AutocadGroupUnpacker _groupUnpacker;
-  private readonly ILogger<AutocadRootObjectBuilder> _logger;
-  private readonly ISdkActivityFactory _activityFactory;
-
-  protected AutocadRootObjectBaseBuilder(
-    IRootToSpeckleConverter converter,
-    ISendConversionCache sendConversionCache,
-    AutocadInstanceUnpacker instanceObjectManager,
-    AutocadMaterialUnpacker materialUnpacker,
-    AutocadColorUnpacker colorUnpacker,
-    AutocadGroupUnpacker groupUnpacker,
-    ILogger<AutocadRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory
-  )
-  {
-    _converter = converter;
-    _sendConversionCache = sendConversionCache;
-    _instanceUnpacker = instanceObjectManager;
-    _materialUnpacker = materialUnpacker;
-    _colorUnpacker = colorUnpacker;
-    _groupUnpacker = groupUnpacker;
-    _logger = logger;
-    _activityFactory = activityFactory;
-  }
-
-  public Task<RootObjectBuilderResult> Build(
-    IReadOnlyList<AutocadRootObject> objects,
-    SendInfo sendInfo,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken ct = default
-  ) => Task.FromResult(BuildSync(objects, sendInfo, onOperationProgressed, ct));
-
-  [SuppressMessage(
-    "Maintainability",
-    "CA1506:Avoid excessive class coupling",
-    Justification = """
-      It is already simplified but has many different references since it is a builder. Do not know can we simplify it now.
-      Later we might consider to refactor proxies from one proxy manager? but we do not know the shape of it all potential
-      proxy classes yet. So I'm supressing this one now!!!
-      """
-  )]
-  private RootObjectBuilderResult BuildSync(
-    IReadOnlyList<AutocadRootObject> objects,
-    SendInfo sendInfo,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken ct = default
-  )
-  {
-    // 0 - Init the root
-    Collection root =
-      new()
-      {
-        name = Application
-          .DocumentManager.CurrentDocument.Name // POC: https://spockle.atlassian.net/browse/CNX-9319
-          .Split(_documentPathSeparator, StringSplitOptions.None)
-          .Reverse()
-          .First()
-      };
-
-    // TODO: better handling for document and transactions!!
-    Document doc = Application.DocumentManager.CurrentDocument;
-    using Transaction tr = doc.Database.TransactionManager.StartTransaction();
-
-    // 1 - Unpack the instances
-    var (atomicObjects, instanceProxies, instanceDefinitionProxies) = _instanceUnpacker.UnpackSelection(objects);
-    root[ProxyKeys.INSTANCE_DEFINITION] = instanceDefinitionProxies;
-
-    // 2 - Unpack the groups
-    root[ProxyKeys.GROUP] = _groupUnpacker.UnpackGroups(atomicObjects);
-    using (var _ = _activityFactory.Start("Converting objects"))
-    {
-      // 3 - Convert atomic objects
-      List<LayerTableRecord> usedAcadLayers = new(); // Keeps track of autocad layers used, so we can pass them on later to the material and color unpacker.
-      List<SendConversionResult> results = new();
-      int count = 0;
-      foreach (var (entity, applicationId) in atomicObjects)
-      {
-        ct.ThrowIfCancellationRequested();
-        using (var convertActivity = _activityFactory.Start("Converting object"))
-        {
-          // Create and add a collection for this entity if not done so already.
-          (Collection objectCollection, LayerTableRecord? autocadLayer) = CreateObjectCollection(entity, tr);
-
-          if (autocadLayer is not null)
-          {
-            usedAcadLayers.Add(autocadLayer);
-            root.elements.Add(objectCollection);
-          }
-
-          var result = ConvertAutocadEntity(
-            entity,
-            applicationId,
-            objectCollection,
-            instanceProxies,
-            sendInfo.ProjectId
-          );
-          results.Add(result);
-
-          onOperationProgressed.Report(new("Converting", (double)++count / atomicObjects.Count));
-        }
-      }
-
-      if (results.All(x => x.Status == Status.ERROR))
-      {
-        throw new SpeckleException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
-      }
-
-      // 4 - Unpack the render material proxies
-      root[ProxyKeys.RENDER_MATERIAL] = _materialUnpacker.UnpackMaterials(atomicObjects, usedAcadLayers);
-
-      // 5 - Unpack the color proxies
-      root[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, usedAcadLayers);
-
-      // add any additional properties (most likely from verticals)
-      AddAdditionalProxiesToRoot(root);
-
-      return new RootObjectBuilderResult(root, results);
-    }
-  }
-
-  public virtual (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
-  {
-    return (new(), null);
-  }
-
-  public virtual void AddAdditionalProxiesToRoot(Collection rootCollection)
-  {
-    return;
-  }
-
-  private SendConversionResult ConvertAutocadEntity(
-    Entity entity,
-    string applicationId,
-    Collection collectionHost,
-    IReadOnlyDictionary<string, InstanceProxy> instanceProxies,
-    string projectId
-  )
-  {
-    string sourceType = entity.GetType().ToString();
-    try
-    {
-      Base converted;
-      if (entity is BlockReference && instanceProxies.TryGetValue(applicationId, out InstanceProxy? instanceProxy))
-      {
-        converted = instanceProxy;
-      }
-      else if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
-      {
-        converted = value;
-      }
-      else
-      {
-        converted = _converter.Convert(entity);
-        converted.applicationId = applicationId;
-      }
-
-      collectionHost.elements.Add(converted);
-      return new(Status.SUCCESS, applicationId, sourceType, converted);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogSendConversionError(ex, sourceType);
-      return new(Status.ERROR, applicationId, sourceType, null, ex);
-    }
-  }
-}
@@ -1,46 +1,180 @@
+using System.Diagnostics.CodeAnalysis;
 using Autodesk.AutoCAD.DatabaseServices;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp;
+using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.Common.Caching;
+using Speckle.Connectors.Common.Conversion;
+using Speckle.Connectors.Common.Extensions;
+using Speckle.Connectors.Common.Operations;
+using Speckle.Converters.Autocad;
 using Speckle.Converters.Common;
+using Speckle.Sdk;
 using Speckle.Sdk.Logging;
+using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.Instances;

 namespace Speckle.Connectors.Autocad.Operations.Send;

-public sealed class AutocadRootObjectBuilder : AutocadRootObjectBaseBuilder
+public class AutocadRootObjectBuilder : IRootObjectBuilder<AutocadRootObject>
 {
+  private readonly IRootToSpeckleConverter _converter;
+  private readonly string[] _documentPathSeparator = ["\\"];
+  private readonly IConverterSettingsStore<AutocadConversionSettings> _converterSettings;
+  private readonly ISendConversionCache _sendConversionCache;
+  private readonly AutocadInstanceUnpacker _instanceUnpacker;
+  private readonly AutocadMaterialUnpacker _materialUnpacker;
+  private readonly AutocadColorUnpacker _colorUnpacker;
  private readonly AutocadLayerUnpacker _layerUnpacker;
+  private readonly AutocadGroupUnpacker _groupUnpacker;
+  private readonly ILogger<AutocadRootObjectBuilder> _logger;
+  private readonly ISdkActivityFactory _activityFactory;

  public AutocadRootObjectBuilder(
-    AutocadLayerUnpacker layerUnpacker,
    IRootToSpeckleConverter converter,
    ISendConversionCache sendConversionCache,
    AutocadInstanceUnpacker instanceObjectManager,
    AutocadMaterialUnpacker materialUnpacker,
    AutocadColorUnpacker colorUnpacker,
+    AutocadLayerUnpacker layerUnpacker,
    AutocadGroupUnpacker groupUnpacker,
    ILogger<AutocadRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory
+    ISdkActivityFactory activityFactory,
+    IConverterSettingsStore<AutocadConversionSettings> converterSettings
  )
-    : base(
-      converter,
-      sendConversionCache,
-      instanceObjectManager,
-      materialUnpacker,
-      colorUnpacker,
-      groupUnpacker,
-      logger,
-      activityFactory
-    )
  {
+    _converter = converter;
+    _sendConversionCache = sendConversionCache;
+    _instanceUnpacker = instanceObjectManager;
+    _materialUnpacker = materialUnpacker;
+    _colorUnpacker = colorUnpacker;
    _layerUnpacker = layerUnpacker;
+    _groupUnpacker = groupUnpacker;
+    _logger = logger;
+    _activityFactory = activityFactory;
+    _converterSettings = converterSettings;
  }

-  public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
-  {
-    Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
+  public Task<RootObjectBuilderResult> Build(
+    IReadOnlyList<AutocadRootObject> objects,
+    SendInfo sendInfo,
+    Action<string, double?>? onOperationProgressed = null,
+    CancellationToken ct = default
+  ) => Task.FromResult(BuildSync(objects, sendInfo, onOperationProgressed, ct));

-    return (layer, autocadLayer);
+  [SuppressMessage(
+    "Maintainability",
+    "CA1506:Avoid excessive class coupling",
+    Justification = """
+      It is already simplified but has many different references since it is a builder. Do not know can we simplify it now.
+      Later we might consider to refactor proxies from one proxy manager? but we do not know the shape of it all potential
+      proxy classes yet. So I'm supressing this one now!!!
+      """
+  )]
+  private RootObjectBuilderResult BuildSync(
+    IReadOnlyList<AutocadRootObject> objects,
+    SendInfo sendInfo,
+    Action<string, double?>? onOperationProgressed,
+    CancellationToken ct
+  )
+  {
+    // 0 - Init the root
+    Collection root =
+      new()
+      {
+        name = Application
+          .DocumentManager.CurrentDocument.Name // POC: https://spockle.atlassian.net/browse/CNX-9319
+          .Split(_documentPathSeparator, StringSplitOptions.None)
+          .Reverse()
+          .First()
+      };
+    root["units"] = _converterSettings.Current.SpeckleUnits;
+
+    // TODO: better handling for document and transactions!!
+    Document doc = Application.DocumentManager.CurrentDocument;
+    using Transaction tr = doc.Database.TransactionManager.StartTransaction();
+
+    // 1 - Unpack the instances
+    var (atomicObjects, instanceProxies, instanceDefinitionProxies) = _instanceUnpacker.UnpackSelection(objects);
+    root[ProxyKeys.INSTANCE_DEFINITION] = instanceDefinitionProxies;
+
+    // 2 - Unpack the groups
+    root[ProxyKeys.GROUP] = _groupUnpacker.UnpackGroups(atomicObjects);
+    using (var _ = _activityFactory.Start("Converting objects"))
+    {
+      // 3 - Convert atomic objects
+      List<LayerTableRecord> usedAcadLayers = new(); // Keeps track of autocad layers used, so we can pass them on later to the material and color unpacker.
+      List<SendConversionResult> results = new();
+      int count = 0;
+      foreach (var (entity, applicationId) in atomicObjects)
+      {
+        ct.ThrowIfCancellationRequested();
+        using (var convertActivity = _activityFactory.Start("Converting object"))
+        {
+          // Create and add a collection for each layer if not done so already.
+          Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
+          if (autocadLayer is not null)
+          {
+            usedAcadLayers.Add(autocadLayer);
+            root.elements.Add(layer);
+          }
+
+          var result = ConvertAutocadEntity(entity, applicationId, layer, instanceProxies, sendInfo.ProjectId);
+          results.Add(result);
+
+          onOperationProgressed?.Invoke("Converting", (double)++count / atomicObjects.Count);
+        }
+      }
+
+      if (results.All(x => x.Status == Status.ERROR))
+      {
+        throw new SpeckleConversionException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
+      }
+
+      // 4 - Unpack the render material proxies
+      root[ProxyKeys.RENDER_MATERIAL] = _materialUnpacker.UnpackMaterials(atomicObjects, usedAcadLayers);
+
+      // 5 - Unpack the color proxies
+      root[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, usedAcadLayers);
+
+      return new RootObjectBuilderResult(root, results);
+    }
+  }
+
+  private SendConversionResult ConvertAutocadEntity(
+    Entity entity,
+    string applicationId,
+    Collection collectionHost,
+    IReadOnlyDictionary<string, InstanceProxy> instanceProxies,
+    string projectId
+  )
+  {
+    string sourceType = entity.GetType().ToString();
+    try
+    {
+      Base converted;
+      if (entity is BlockReference && instanceProxies.TryGetValue(applicationId, out InstanceProxy? instanceProxy))
+      {
+        converted = instanceProxy;
+      }
+      else if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
+      {
+        converted = value;
+      }
+      else
+      {
+        converted = _converter.Convert(entity);
+        converted.applicationId = applicationId;
+      }
+
+      collectionHost.elements.Add(converted);
+      return new(Status.SUCCESS, applicationId, sourceType, converted);
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      _logger.LogSendConversionError(ex, sourceType);
+      return new(Status.ERROR, applicationId, sourceType, null, ex);
+    }
  }
 }
@@ -10,19 +10,21 @@ public static class AppUtils
 #elif AUTOCAD
    HostApplications.AutoCAD;
 #else
-    throw new NotSupportedException();
+    throw new NotImplementedException();
 #endif

  public static HostAppVersion Version =>
-#if AUTOCAD2025 || CIVIL3D2025
-    HostAppVersion.v2025;
-#elif AUTOCAD2024 || CIVIL3D2024
+#if CIVIL3D2024
    HostAppVersion.v2024;
-#elif AUTOCAD2023|| CIVIL3D2023
+#elif AUTOCAD2025
+    HostAppVersion.v2025;
+#elif AUTOCAD2024
+    HostAppVersion.v2024;
+#elif AUTOCAD2023
    HostAppVersion.v2023;
-#elif AUTOCAD2022 || CIVIL3D2022
+#elif AUTOCAD2022
    HostAppVersion.v2022;
 #else
-    throw new NotSupportedException();
+    throw new NotImplementedException();
 #endif
 }
@@ -2,15 +2,14 @@ using System.Drawing;
 using Autodesk.AutoCAD.Runtime;
 using Autodesk.AutoCAD.Windows;
 using Microsoft.Extensions.DependencyInjection;
+using Speckle.Connectors.Autocad.DependencyInjection;
 using Speckle.Connectors.Common;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.WebView;
 #if AUTOCAD
-using Speckle.Connectors.Autocad.DependencyInjection;
 using Speckle.Converters.Autocad;
 #elif CIVIL3D
-using Speckle.Converters.Civil3dShared;
-using Speckle.Connectors.Civil3dShared.DependencyInjection;
+using Speckle.Converters.Civil3d;
 #endif
 namespace Speckle.Connectors.Autocad.Plugin;

@@ -31,7 +30,7 @@ public class AutocadCommand
      return;
    }

-    PaletteSet = new PaletteSet($"Speckle (Beta) for {AppUtils.App.Name}", s_id)
+    PaletteSet = new PaletteSet("Speckle (Beta) for Autocad", s_id)
    {
      Size = new Size(400, 500),
      DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right)
@@ -52,7 +51,7 @@ public class AutocadCommand

    var panelWebView = Container.GetRequiredService<DUI3ControlWebView>();

-    PaletteSet.AddVisual($"Speckle (Beta) for {AppUtils.App.Name} WebView", panelWebView);
+    PaletteSet.AddVisual("Speckle (Beta) for Autocad WebView", panelWebView);

    FocusPalette();
  }
@@ -13,9 +13,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)Bindings\AutocadReceiveBinding.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Bindings\AutocadSendBinding.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Bindings\AutocadBasicConnectorBinding.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\AutocadSendBaseBinding.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\SharedRegistration.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\AutocadConnectorModule.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\Civil3dConnectorModule.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Filters\AutocadSelectionFilter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadColorBaker.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadColorUnpacker.cs" />
@@ -39,7 +39,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\TransactionContext.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\AutocadHostObjectBuilder.cs" />
    <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\AutocadRibbon.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\AutocadExtensionApplication.cs" />
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
-    <Civil3DVersion>2022</Civil3DVersion>
-    <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2022;CIVIL3D2022_OR_GREATER</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" />
-    <PackageReference Include="Speckle.Civil3D.API" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2022\Speckle.Converters.Civil3d2022.csproj" />
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
-  </ItemGroup>
-  
-  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
-</Project>
@@ -1,392 +0,0 @@
-{
-  "version": 2,
-  "dependencies": {
-    ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "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.AutoCAD.API": {
-        "type": "Direct",
-        "requested": "[2022.0.2, )",
-        "resolved": "2022.0.2",
-        "contentHash": "NFHXnlkBjzM8Bau52d6eF6m0+etHddGx7qlWN8YyrfTtGyz+AmPvF8fgxcLgyjAcB3W4Wim11JeYuEoTNH1X0w=="
-      },
-      "Speckle.Civil3D.API": {
-        "type": "Direct",
-        "requested": "[2022.0.2, )",
-        "resolved": "2022.0.2",
-        "contentHash": "H36v9rA2Ynh4gDCzpBeUcWs4BQwWi3MwgTAnClM22vNbQXZlxjK85iO8i/mJsX57hh8VfqLB8EA7CUw94gBddw==",
-        "dependencies": {
-          "Speckle.AutoCAD.API": "2022.0.2"
-        }
-      },
-      "Speckle.InterfaceGenerator": {
-        "type": "Direct",
-        "requested": "[0.9.6, )",
-        "resolved": "0.9.6",
-        "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
-      },
-      "GraphQL.Client": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==",
-        "dependencies": {
-          "GraphQL.Client.Abstractions": "6.0.0",
-          "GraphQL.Client.Abstractions.Websocket": "6.0.0",
-          "System.Net.WebSockets.Client.Managed": "1.0.22",
-          "System.Reactive": "5.0.0"
-        }
-      },
-      "GraphQL.Client.Abstractions": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==",
-        "dependencies": {
-          "GraphQL.Primitives": "6.0.0"
-        }
-      },
-      "GraphQL.Client.Abstractions.Websocket": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==",
-        "dependencies": {
-          "GraphQL.Client.Abstractions": "6.0.0"
-        }
-      },
-      "GraphQL.Primitives": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
-      },
-      "Microsoft.Build.Tasks.Git": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
-      },
-      "Microsoft.CSharp": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
-      },
-      "Microsoft.Data.Sqlite": {
-        "type": "Transitive",
-        "resolved": "7.0.7",
-        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.7",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.7",
-        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
-        "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
-        }
-      },
-      "Microsoft.Extensions.Configuration": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Abstractions": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
-        "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Binder": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
-      "Microsoft.Extensions.Options": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
-        }
-      },
-      "Microsoft.Extensions.Primitives": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
-        "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
-        }
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
-      "Microsoft.SourceLink.Common": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
-      },
-      "Polly": {
-        "type": "Transitive",
-        "resolved": "7.2.3",
-        "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ=="
-      },
-      "Polly.Contrib.WaitAndRetry": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA=="
-      },
-      "Polly.Extensions.Http": {
-        "type": "Transitive",
-        "resolved": "3.0.0",
-        "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==",
-        "dependencies": {
-          "Polly": "7.1.0"
-        }
-      },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
-      "Speckle.Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.2",
-        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "SQLitePCLRaw.bundle_e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==",
-        "dependencies": {
-          "SQLitePCLRaw.lib.e_sqlite3": "2.1.4",
-          "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4"
-        }
-      },
-      "SQLitePCLRaw.core": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==",
-        "dependencies": {
-          "System.Memory": "4.5.3"
-        }
-      },
-      "SQLitePCLRaw.lib.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      },
-      "SQLitePCLRaw.provider.dynamic_cdecl": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==",
-        "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
-        }
-      },
-      "System.Buffers": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
-      },
-      "System.ComponentModel.Annotations": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
-      },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
-        "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
-        }
-      },
-      "System.Net.WebSockets.Client.Managed": {
-        "type": "Transitive",
-        "resolved": "1.0.22",
-        "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==",
-        "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0"
-        }
-      },
-      "System.Numerics.Vectors": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
-      },
-      "System.Reactive": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "System.Runtime.CompilerServices.Unsafe": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
-      },
-      "System.Threading.Tasks.Extensions": {
-        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
-        }
-      },
-      "speckle.connectors.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
-        }
-      },
-      "speckle.connectors.dui": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
-          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
-        }
-      },
-      "speckle.connectors.dui.webview": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Web.WebView2": "[1.0.1938.49, )",
-          "Speckle.Connectors.DUI": "[1.0.0, )"
-        }
-      },
-      "speckle.connectors.logging": {
-        "type": "Project"
-      },
-      "speckle.converters.civil3d2022": {
-        "type": "Project",
-        "dependencies": {
-          "Speckle.AutoCAD.API": "[2022.0.2, )",
-          "Speckle.Civil3D.API": "[2022.0.2, )",
-          "Speckle.Converters.Common": "[1.0.0, )"
-        }
-      },
-      "speckle.converters.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Logging": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Logging.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
-      },
-      "Microsoft.Web.WebView2": {
-        "type": "CentralTransitive",
-        "requested": "[1.0.1938.49, )",
-        "resolved": "1.0.1938.49",
-        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
-      },
-      "Speckle.Objects": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
-        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Polly": "7.2.3",
-          "Polly.Contrib.WaitAndRetry": "1.1.1",
-          "Polly.Extensions.Http": "3.0.0",
-          "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
-        }
-      },
-      "System.Threading.Tasks.Dataflow": {
-        "type": "CentralTransitive",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA=="
-      }
-    }
-  }
-}
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
-    <Civil3DVersion>2023</Civil3DVersion>
-    <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2023;CIVIL3D2023_OR_GREATER</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" />
-    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2023.0.0" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2023\Speckle.Converters.Civil3d2023.csproj" />
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
-  </ItemGroup>
-  
-  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
-</Project>
@@ -1,392 +0,0 @@
-{
-  "version": 2,
-  "dependencies": {
-    ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "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.AutoCAD.API": {
-        "type": "Direct",
-        "requested": "[2023.0.0, )",
-        "resolved": "2023.0.0",
-        "contentHash": "aNfiNw9zRW8pCl8AAQK7afEJuea4bJ4sFNsGVSDrdq1egaonZrwALU01dSyFNCE8tne86eVjlprpOGG6r0+G/A=="
-      },
-      "Speckle.Civil3D.API": {
-        "type": "Direct",
-        "requested": "[2023.0.0, )",
-        "resolved": "2023.0.0",
-        "contentHash": "URb0wfrxm4jcAApRxZ15a1dmxWDRry8WAuGmUwC7saP5+ltkJOVSOYb6WeJKYhDiJbO3UlVCesTFNnsNjMFd5A==",
-        "dependencies": {
-          "Speckle.AutoCAD.API": "2022.0.2"
-        }
-      },
-      "Speckle.InterfaceGenerator": {
-        "type": "Direct",
-        "requested": "[0.9.6, )",
-        "resolved": "0.9.6",
-        "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
-      },
-      "GraphQL.Client": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==",
-        "dependencies": {
-          "GraphQL.Client.Abstractions": "6.0.0",
-          "GraphQL.Client.Abstractions.Websocket": "6.0.0",
-          "System.Net.WebSockets.Client.Managed": "1.0.22",
-          "System.Reactive": "5.0.0"
-        }
-      },
-      "GraphQL.Client.Abstractions": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==",
-        "dependencies": {
-          "GraphQL.Primitives": "6.0.0"
-        }
-      },
-      "GraphQL.Client.Abstractions.Websocket": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==",
-        "dependencies": {
-          "GraphQL.Client.Abstractions": "6.0.0"
-        }
-      },
-      "GraphQL.Primitives": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
-      },
-      "Microsoft.Build.Tasks.Git": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
-      },
-      "Microsoft.CSharp": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
-      },
-      "Microsoft.Data.Sqlite": {
-        "type": "Transitive",
-        "resolved": "7.0.7",
-        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.7",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.7",
-        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
-        "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
-        }
-      },
-      "Microsoft.Extensions.Configuration": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Abstractions": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
-        "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Binder": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
-      "Microsoft.Extensions.Options": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
-        }
-      },
-      "Microsoft.Extensions.Primitives": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
-        "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
-        }
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
-      "Microsoft.SourceLink.Common": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
-      },
-      "Polly": {
-        "type": "Transitive",
-        "resolved": "7.2.3",
-        "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ=="
-      },
-      "Polly.Contrib.WaitAndRetry": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA=="
-      },
-      "Polly.Extensions.Http": {
-        "type": "Transitive",
-        "resolved": "3.0.0",
-        "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==",
-        "dependencies": {
-          "Polly": "7.1.0"
-        }
-      },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
-      "Speckle.Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.2",
-        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "SQLitePCLRaw.bundle_e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==",
-        "dependencies": {
-          "SQLitePCLRaw.lib.e_sqlite3": "2.1.4",
-          "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4"
-        }
-      },
-      "SQLitePCLRaw.core": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==",
-        "dependencies": {
-          "System.Memory": "4.5.3"
-        }
-      },
-      "SQLitePCLRaw.lib.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      },
-      "SQLitePCLRaw.provider.dynamic_cdecl": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==",
-        "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
-        }
-      },
-      "System.Buffers": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
-      },
-      "System.ComponentModel.Annotations": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
-      },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
-        "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
-        }
-      },
-      "System.Net.WebSockets.Client.Managed": {
-        "type": "Transitive",
-        "resolved": "1.0.22",
-        "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==",
-        "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0"
-        }
-      },
-      "System.Numerics.Vectors": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
-      },
-      "System.Reactive": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "System.Runtime.CompilerServices.Unsafe": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
-      },
-      "System.Threading.Tasks.Extensions": {
-        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
-        }
-      },
-      "speckle.connectors.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
-        }
-      },
-      "speckle.connectors.dui": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
-          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
-        }
-      },
-      "speckle.connectors.dui.webview": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Web.WebView2": "[1.0.1938.49, )",
-          "Speckle.Connectors.DUI": "[1.0.0, )"
-        }
-      },
-      "speckle.connectors.logging": {
-        "type": "Project"
-      },
-      "speckle.converters.civil3d2023": {
-        "type": "Project",
-        "dependencies": {
-          "Speckle.AutoCAD.API": "[2023.0.0, )",
-          "Speckle.Civil3D.API": "[2023.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )"
-        }
-      },
-      "speckle.converters.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Logging": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Logging.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
-      },
-      "Microsoft.Web.WebView2": {
-        "type": "CentralTransitive",
-        "requested": "[1.0.1938.49, )",
-        "resolved": "1.0.1938.49",
-        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
-      },
-      "Speckle.Objects": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
-        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Polly": "7.2.3",
-          "Polly.Contrib.WaitAndRetry": "1.1.1",
-          "Polly.Extensions.Http": "3.0.0",
-          "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
-        }
-      },
-      "System.Threading.Tasks.Dataflow": {
-        "type": "CentralTransitive",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA=="
-      }
-    }
-  }
-}
@@ -22,5 +22,4 @@
  </ItemGroup>
  
  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
 </Project>
@@ -283,8 +283,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -292,7 +292,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -318,7 +318,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -356,18 +356,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
-    <Civil3DVersion>2025</Civil3DVersion>
-    <DefineConstants>$(DefineConstants);CIVIL3D2025;CIVIL3D</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" />
-    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2025.0.0" />
-    <FrameworkReference Include="Microsoft.WindowsDesktop.App" />
-  </ItemGroup>  
-  
-  <ItemGroup>   
-    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2025\Speckle.Converters.Civil3d2025.csproj" />
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
-  </ItemGroup>
-  
-  <Import Project="..\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
-  
-  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-</Project>
@@ -1,370 +0,0 @@
-{
-  "version": 2,
-  "dependencies": {
-    "net8.0-windows7.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.AutoCAD.API": {
-        "type": "Direct",
-        "requested": "[2025.0.0, )",
-        "resolved": "2025.0.0",
-        "contentHash": "dqEgZ+bTqAG0tx0WwdnTZcbNKH2igzhOr3SMXtRYai7yIqXiz5btZ4Mf2bmfxbmxLucww3GKVpdZoI+PSZlMuQ=="
-      },
-      "Speckle.Civil3D.API": {
-        "type": "Direct",
-        "requested": "[2025.0.0, )",
-        "resolved": "2025.0.0",
-        "contentHash": "zWxdzk7M2JE1+PgIpGrCycDUwbmTqJ+YCNMaJPbjUgVKoAiI5w7Ou9ynbFgmQkRuYrkTflbL+s799Fw62PJixQ==",
-        "dependencies": {
-          "Speckle.AutoCAD.API": "2025.0.0"
-        }
-      },
-      "Speckle.InterfaceGenerator": {
-        "type": "Direct",
-        "requested": "[0.9.6, )",
-        "resolved": "0.9.6",
-        "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
-      },
-      "GraphQL.Client": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==",
-        "dependencies": {
-          "GraphQL.Client.Abstractions": "6.0.0",
-          "GraphQL.Client.Abstractions.Websocket": "6.0.0",
-          "System.Reactive": "5.0.0"
-        }
-      },
-      "GraphQL.Client.Abstractions": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==",
-        "dependencies": {
-          "GraphQL.Primitives": "6.0.0"
-        }
-      },
-      "GraphQL.Client.Abstractions.Websocket": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==",
-        "dependencies": {
-          "GraphQL.Client.Abstractions": "6.0.0"
-        }
-      },
-      "GraphQL.Primitives": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
-      },
-      "Microsoft.Build.Tasks.Git": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
-      },
-      "Microsoft.CSharp": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
-      },
-      "Microsoft.Data.Sqlite": {
-        "type": "Transitive",
-        "resolved": "7.0.7",
-        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.7",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.7",
-        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
-        "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
-        }
-      },
-      "Microsoft.Extensions.Configuration": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Abstractions": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
-        "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Binder": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
-      "Microsoft.Extensions.Options": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
-        }
-      },
-      "Microsoft.Extensions.Primitives": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
-        "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
-        }
-      },
-      "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=="
-      },
-      "Polly": {
-        "type": "Transitive",
-        "resolved": "7.2.3",
-        "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ=="
-      },
-      "Polly.Contrib.WaitAndRetry": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA=="
-      },
-      "Polly.Extensions.Http": {
-        "type": "Transitive",
-        "resolved": "3.0.0",
-        "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==",
-        "dependencies": {
-          "Polly": "7.1.0"
-        }
-      },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
-      "Speckle.Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.2",
-        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "SQLitePCLRaw.bundle_e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==",
-        "dependencies": {
-          "SQLitePCLRaw.lib.e_sqlite3": "2.1.4",
-          "SQLitePCLRaw.provider.e_sqlite3": "2.1.4"
-        }
-      },
-      "SQLitePCLRaw.core": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==",
-        "dependencies": {
-          "System.Memory": "4.5.3"
-        }
-      },
-      "SQLitePCLRaw.lib.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      },
-      "SQLitePCLRaw.provider.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "CSlb5dUp1FMIkez9Iv5EXzpeq7rHryVNqwJMWnpq87j9zWZexaEMdisDktMsnnrzKM6ahNrsTkjqNodTBPBxtQ==",
-        "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
-        }
-      },
-      "System.ComponentModel.Annotations": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
-      },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
-      },
-      "System.Reactive": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ=="
-      },
-      "System.Runtime.CompilerServices.Unsafe": {
-        "type": "Transitive",
-        "resolved": "4.5.1",
-        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
-      },
-      "speckle.connectors.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
-        }
-      },
-      "speckle.connectors.dui": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
-          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
-        }
-      },
-      "speckle.connectors.dui.webview": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Web.WebView2": "[1.0.1938.49, )",
-          "Speckle.Connectors.DUI": "[1.0.0, )"
-        }
-      },
-      "speckle.connectors.logging": {
-        "type": "Project"
-      },
-      "speckle.converters.civil3d2025": {
-        "type": "Project",
-        "dependencies": {
-          "Speckle.AutoCAD.API": "[2025.0.0, )",
-          "Speckle.Civil3d.API": "[2025.0.0, )",
-          "Speckle.Connectors.DUI.WebView": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )"
-        }
-      },
-      "speckle.converters.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Logging": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Logging.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
-      },
-      "Microsoft.Web.WebView2": {
-        "type": "CentralTransitive",
-        "requested": "[1.0.1938.49, )",
-        "resolved": "1.0.1938.49",
-        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
-      },
-      "Speckle.Objects": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
-        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Polly": "7.2.3",
-          "Polly.Contrib.WaitAndRetry": "1.1.1",
-          "Polly.Extensions.Http": "3.0.0",
-          "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
-        }
-      },
-      "System.Threading.Tasks.Dataflow": {
-        "type": "CentralTransitive",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA=="
-      }
-    },
-    "net8.0-windows7.0/win-x64": {
-      "SQLitePCLRaw.lib.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      },
-      "Microsoft.Web.WebView2": {
-        "type": "CentralTransitive",
-        "requested": "[1.0.1938.49, )",
-        "resolved": "1.0.1938.49",
-        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
-      }
-    }
-  }
-}
@@ -1,66 +0,0 @@
-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.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
-using Speckle.Connectors.DUI.Models;
-using Speckle.Connectors.DUI.Models.Card.SendFilter;
-using Speckle.Converters.Autocad;
-using Speckle.Converters.Civil3dShared;
-using Speckle.Converters.Common;
-using Speckle.Sdk;
-
-namespace Speckle.Connectors.Civil3dShared.Bindings;
-
-public sealed class Civil3dSendBinding : AutocadSendBaseBinding
-{
-  private readonly ICivil3dConversionSettingsFactory _civil3dConversionSettingsFactory;
-  private readonly IAutocadConversionSettingsFactory _autocadConversionSettingsFactory;
-
-  public Civil3dSendBinding(
-    DocumentModelStore store,
-    IAutocadIdleManager idleManager,
-    IBrowserBridge parent,
-    IEnumerable<ISendFilter> sendFilters,
-    CancellationManager cancellationManager,
-    IServiceProvider serviceProvider,
-    ISendConversionCache sendConversionCache,
-    IOperationProgressManager operationProgressManager,
-    ILogger<AutocadSendBinding> logger,
-    ICivil3dConversionSettingsFactory civil3dConversionSettingsFactory,
-    IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
-    ISpeckleApplication speckleApplication
-  )
-    : base(
-      store,
-      idleManager,
-      parent,
-      sendFilters,
-      cancellationManager,
-      serviceProvider,
-      sendConversionCache,
-      operationProgressManager,
-      logger,
-      speckleApplication
-    )
-  {
-    _civil3dConversionSettingsFactory = civil3dConversionSettingsFactory;
-    _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
-  }
-
-  // POC: we're registering the conversion settings for autocad here because we need the autocad conversion settings to be able to use the autocad typed converters.
-  // POC: We need a separate send binding for civil3d due to using a different unit converter (needed for conversion settings construction)
-  protected override void InitializeSettings(IServiceProvider serviceProvider)
-  {
-    serviceProvider
-      .GetRequiredService<IConverterSettingsStore<Civil3dConversionSettings>>()
-      .Initialize(_civil3dConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
-
-    serviceProvider
-      .GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
-      .Initialize(_autocadConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
-  }
-}
@@ -1,34 +0,0 @@
-using System.Reflection;
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Autocad.DependencyInjection;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Civil3dShared.Bindings;
-using Speckle.Connectors.Civil3dShared.Operations.Send;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.DUI.Bindings;
-using Speckle.Converters.Civil3dShared.Helpers;
-using Speckle.Converters.Civil3dShared.ToSpeckle;
-using Speckle.Sdk;
-
-namespace Speckle.Connectors.Civil3dShared.DependencyInjection;
-
-public static class Civil3dConnectorModule
-{
-  public static void AddCivil3d(this IServiceCollection serviceCollection)
-  {
-    serviceCollection.AddAutocadBase();
-    serviceCollection.LoadSend();
-
-    // register civil specific send classes
-    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, Civil3dRootObjectBuilder>();
-    serviceCollection.AddSingleton<IBinding, Civil3dSendBinding>();
-
-    // automatically detects the Class:IClass interface pattern to register all generated interfaces
-    serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly());
-
-    // additional classes
-    serviceCollection.AddScoped<PropertySetDefinitionHandler>();
-    serviceCollection.AddScoped<CatchmentGroupHandler>();
-    serviceCollection.AddScoped<PipeNetworkHandler>();
-  }
-}
@@ -1,67 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.Civil3dShared.Helpers;
-using Speckle.Converters.Civil3dShared.ToSpeckle;
-using Speckle.Converters.Common;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Civil3dShared.Operations.Send;
-
-public sealed class Civil3dRootObjectBuilder : AutocadRootObjectBaseBuilder
-{
-  private readonly AutocadLayerUnpacker _layerUnpacker;
-  private readonly PropertySetDefinitionHandler _propertySetDefinitionHandler;
-  private readonly CatchmentGroupHandler _catchmentGroupHandler;
-  private readonly PipeNetworkHandler _pipeNetworkHandler;
-
-  public Civil3dRootObjectBuilder(
-    AutocadLayerUnpacker layerUnpacker,
-    PropertySetDefinitionHandler propertySetDefinitionHandler,
-    CatchmentGroupHandler catchmentGroupHandler,
-    PipeNetworkHandler pipeNetworkHandler,
-    IRootToSpeckleConverter converter,
-    ISendConversionCache sendConversionCache,
-    AutocadInstanceUnpacker instanceObjectManager,
-    AutocadMaterialUnpacker materialUnpacker,
-    AutocadColorUnpacker colorUnpacker,
-    AutocadGroupUnpacker groupUnpacker,
-    ILogger<AutocadRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory
-  )
-    : base(
-      converter,
-      sendConversionCache,
-      instanceObjectManager,
-      materialUnpacker,
-      colorUnpacker,
-      groupUnpacker,
-      logger,
-      activityFactory
-    )
-  {
-    _layerUnpacker = layerUnpacker;
-    _propertySetDefinitionHandler = propertySetDefinitionHandler;
-    _catchmentGroupHandler = catchmentGroupHandler;
-    _pipeNetworkHandler = pipeNetworkHandler;
-  }
-
-  public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
-  {
-    Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
-
-    return (layer, autocadLayer);
-  }
-
-  // POC: probably will need to add Network proxies as well
-  public override void AddAdditionalProxiesToRoot(Collection rootObject)
-  {
-    rootObject[ProxyKeys.PROPERTYSET_DEFINITIONS] = _propertySetDefinitionHandler.Definitions;
-    rootObject["catchmentGroupProxies"] = _catchmentGroupHandler.CatchmentGroupProxiesCache.Values.ToList();
-    rootObject["pipeNetworkProxies"] = _pipeNetworkHandler.PipeNetworkProxiesCache.Values.ToList();
-  }
-}
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>55E65D72-2FE8-4E61-891C-16A4D551CCF7</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Speckle.Connectors.Civil3dShared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\Civil3dConnectorModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Civil3dRootObjectBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\Civil3dSendBinding.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="$(MSBuildThisFileDirectory)DependencyInjection\" />
-    <Folder Include="$(MSBuildThisFileDirectory)Bindings\" />
-    <Folder Include="$(MSBuildThisFileDirectory)Operations\Send\" />
-  </ItemGroup>
-</Project>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EFD01520-93E8-4CCA-8E03-9CDC635F55F4}</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="Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
@@ -302,8 +302,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -311,7 +311,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -322,7 +322,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "speckle.converters.revit2022": {
@@ -361,11 +361,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Revit.API": {
@@ -376,9 +376,9 @@
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -302,8 +302,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -311,7 +311,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -322,7 +322,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "speckle.converters.revit2023": {
@@ -361,11 +361,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Revit.API": {
@@ -376,9 +376,9 @@
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -302,8 +302,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -311,7 +311,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -322,7 +322,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "speckle.converters.revit2024": {
@@ -361,11 +361,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Revit.API": {
@@ -376,9 +376,9 @@
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -260,8 +260,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -269,7 +269,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -287,7 +287,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "speckle.converters.revit2025": {
@@ -332,11 +332,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Revit.API": {
@@ -347,9 +347,9 @@
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -13,16 +13,8 @@ public partial class CefSharpPanel : Page, Autodesk.Revit.UI.IDockablePaneProvid
    InitializeComponent();
  }

-  public Task ExecuteScriptAsyncMethod(string script, CancellationToken cancellationToken)
-  {
-    Browser.Dispatcher.Invoke(
-      () => Browser.ExecuteScriptAsync(script),
-      DispatcherPriority.Background,
-      cancellationToken
-    );
-
-    return Task.CompletedTask;
-  }
+  public void ExecuteScriptAsyncMethod(string script) =>
+    Browser.Dispatcher.Invoke(() => Browser.ExecuteScriptAsync(script), DispatcherPriority.Background);

  public bool IsBrowserInitialized => Browser.IsBrowserInitialized;
  public object BrowserElement => Browser;
@@ -42,10 +42,9 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding

    // POC: event binding?
    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged().ConfigureAwait(false);
-      });
+    {
+      Commands.NotifyDocumentChanged();
+    };
  }

  public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
@@ -83,7 +82,7 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding

  public void RemoveModel(ModelCard model) => _store.RemoveModel(model);

-  public async Task HighlightModel(string modelCardId)
+  public void HighlightModel(string modelCardId)
  {
    var model = _store.GetModelById(modelCardId);

@@ -105,8 +104,6 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
        .SendFilter.NotNull()
        .GetObjectIds()
        .Select(uid => ElementIdHelper.GetElementIdFromUniqueId(activeUIDoc.Document, uid))
-        .Where(el => el is not null)
-        .Cast<ElementId>()
        .ToList();
    }

@@ -115,44 +112,34 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
      elementIds = receiverModelCard
        .BakedObjectIds.NotNull()
        .Select(uid => ElementIdHelper.GetElementIdFromUniqueId(activeUIDoc.Document, uid))
-        .Where(el => el is not null)
-        .Cast<ElementId>()
        .ToList();
    }

    if (elementIds.Count == 0)
    {
-      await Commands
-        .SetModelError(modelCardId, new InvalidOperationException("No objects found to highlight."))
-        .ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, new InvalidOperationException("No objects found to highlight."));
      return;
    }

-    await HighlightObjectsOnView(elementIds).ConfigureAwait(false);
+    HighlightObjectsOnView(elementIds);
  }

  /// <summary>
  /// Highlights the objects from the given ids.
  /// </summary>
  /// <param name="objectIds"> UniqueId's of the DB.Elements.</param>
-  public async Task HighlightObjects(IReadOnlyList<string> objectIds)
+  public void HighlightObjects(List<string> objectIds)
  {
    var activeUIDoc =
      _revitContext.UIApplication?.ActiveUIDocument
      ?? throw new SpeckleException("Unable to retrieve active UI document");

-    await HighlightObjectsOnView(
-        objectIds
-          .Select(uid => ElementIdHelper.GetElementIdFromUniqueId(activeUIDoc.Document, uid))
-          .Where(el => el is not null)
-          .Cast<ElementId>()
-          .ToList()
-      )
-      .ConfigureAwait(false);
-    ;
+    HighlightObjectsOnView(
+      objectIds.Select(uid => ElementIdHelper.GetElementIdFromUniqueId(activeUIDoc.Document, uid)).ToList()
+    );
  }

-  private async Task HighlightObjectsOnView(List<ElementId> objectIds)
+  private void HighlightObjectsOnView(List<ElementId> objectIds)
  {
    // POC: don't know if we can rely on storing the ActiveUIDocument, hence getting it each time
    var activeUIDoc =
@@ -160,13 +147,10 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
      ?? throw new SpeckleException("Unable to retrieve active UI document");

    // UiDocument operations should be wrapped into RevitTask, otherwise doesn't work on other tasks.
-    await RevitTask
-      .RunAsync(() =>
-      {
-        activeUIDoc.Selection.SetElementIds(objectIds);
-        activeUIDoc.ShowElements(objectIds);
-      })
-      .ConfigureAwait(false);
-    ;
+    RevitTask.RunAsync(() =>
+    {
+      activeUIDoc.Selection.SetElementIds(objectIds);
+      activeUIDoc.ShowElements(objectIds);
+    });
  }
 }
@@ -8,6 +8,7 @@ using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
+using Speckle.Connectors.DUI.Settings;
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Settings;
 using Speckle.Sdk;
@@ -51,6 +52,10 @@ internal sealed class RevitReceiveBinding : IReceiveBinding
    Commands = new ReceiveBindingUICommands(parent);
  }

+#pragma warning disable CA1024
+  public List<ICardSetting> GetReceiveSettings() => [];
+#pragma warning restore CA1024
+
  public void CancelReceive(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);

  public async Task Receive(string modelCardId)
@@ -81,15 +86,23 @@ internal sealed class RevitReceiveBinding : IReceiveBinding
        .ServiceProvider.GetRequiredService<ReceiveOperation>()
        .Execute(
          modelCard.GetReceiveInfo(_speckleApplication.Slug),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
-          cancellationToken
+          cancellationToken,
+          (status, progress) =>
+            _operationProgressManager.SetModelProgress(
+              Parent,
+              modelCardId,
+              new ModelCardProgress(modelCardId, status, progress),
+              cancellationToken
+            )
        )
        .ConfigureAwait(false);

      modelCard.BakedObjectIds = conversionResults.BakedObjectIds.ToList();
-      await Commands
-        .SetModelReceiveResult(modelCardId, conversionResults.BakedObjectIds, conversionResults.ConversionResults)
-        .ConfigureAwait(false);
+      Commands.SetModelReceiveResult(
+        modelCardId,
+        conversionResults.BakedObjectIds,
+        conversionResults.ConversionResults
+      );
    }
    catch (OperationCanceledException)
    {
@@ -100,7 +113,7 @@ internal sealed class RevitReceiveBinding : IReceiveBinding
    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
    {
      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, ex);
    }
  }
 }
@@ -82,8 +82,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
      revitContext.UIApplication.NotNull().Application.DocumentChanged += (_, e) =>
        topLevelExceptionHandler.CatchUnhandled(() => DocChangeHandler(e));
    });
-    Store.DocumentChanged += (_, _) =>
-      topLevelExceptionHandler.FireAndForget(async () => await OnDocumentChanged().ConfigureAwait(false));
+    Store.DocumentChanged += (_, _) => topLevelExceptionHandler.CatchUnhandled(OnDocumentChanged);
  }

  public List<ISendFilter> GetSendFilters()
@@ -102,7 +101,10 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding

  public SendBindingUICommands Commands { get; }

+  // yes we know Send function calls many different namespace, we know. But currently I don't see any simplification area we can work on!
+#pragma warning disable CA1506
  public async Task Send(string modelCardId)
+#pragma warning restore CA1506
  {
    // Note: removed top level handling thing as it was confusing me
    try
@@ -132,9 +134,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
      List<ElementId> revitObjects = modelCard
        .SendFilter.NotNull()
        .GetObjectIds()
-        .Select(uid => activeUIDoc.Document.GetElement(uid))
-        .Where(el => el is not null) // NOTE: elements can get deleted from the host app.
-        .Select(el => el.Id)
+        .Select(uid => activeUIDoc.Document.GetElement(uid).Id)
        .ToList();

      if (revitObjects.Count == 0)
@@ -148,14 +148,18 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
        .Execute(
          revitObjects,
          modelCard.GetSendInfo(_speckleApplication.Slug),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
+          (status, progress) =>
+            _operationProgressManager.SetModelProgress(
+              Parent,
+              modelCardId,
+              new ModelCardProgress(modelCardId, status, progress),
+              cancellationToken
+            ),
          cancellationToken
        )
        .ConfigureAwait(false);

-      await Commands
-        .SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults)
-        .ConfigureAwait(false);
+      Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
    }
    catch (OperationCanceledException)
    {
@@ -166,7 +170,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
    {
      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, ex);
    }
  }

@@ -239,7 +243,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
    return false;
  }

-  private async Task RunExpirationChecks()
+  private void RunExpirationChecks()
  {
    var senders = Store.GetSenders();
    string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
@@ -251,9 +255,6 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
    }

    // Note: We're using unique ids as application ids in revit, so cache eviction must happen by those.
-    // NOTE: this is currently broken when deleting freestanding elements (e.g. unhosted elements)
-    // To reproduce, draw two unconnected walls, send, delete one wall -> no expiration notice
-    // I do not yet know the solution besides going back to element ids, but it would mean revisiting why we switched to unique ids (conflicting ids)
    var objUniqueIds = objectIdsList
      .Select(id => new ElementId(Convert.ToInt32(id)))
      .Select(doc.GetElement)
@@ -274,24 +275,22 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
      }
    }

-    await Commands.SetModelsExpired(expiredSenderIds).ConfigureAwait(false);
+    Commands.SetModelsExpired(expiredSenderIds);
    ChangedObjectIds = new();
  }

  // POC: Will be re-addressed later with better UX with host apps that are friendly on async doc operations.
  // That's why don't bother for now how to get rid of from dup logic in other bindings.
-  private async Task OnDocumentChanged()
+  private void OnDocumentChanged()
  {
    if (_cancellationManager.NumberOfOperations > 0)
    {
      _cancellationManager.CancelAllOperations();
-      await Commands
-        .SetGlobalNotification(
-          ToastNotificationType.INFO,
-          "Document Switch",
-          "Operations cancelled because of document swap!"
-        )
-        .ConfigureAwait(false);
+      Commands.SetGlobalNotification(
+        ToastNotificationType.INFO,
+        "Document Switch",
+        "Operations cancelled because of document swap!"
+      );
    }
  }
 }
@@ -1,12 +1,18 @@
 using Autodesk.Revit.DB;
+using Speckle.Converters.Common;

 namespace Speckle.Connectors.RevitShared;

 public static class ElementIdHelper
 {
-  public static ElementId? GetElementIdFromUniqueId(Document doc, string uniqueId)
+  public static ElementId GetElementIdFromUniqueId(Document doc, string uniqueId)
  {
    Element element = doc.GetElement(uniqueId);
-    return element?.Id;
+    if (element == null)
+    {
+      throw new SpeckleConversionException($"Cannot find element with UniqueId: {uniqueId}");
+    }
+
+    return element.Id;
  }
 }
@@ -93,15 +93,8 @@ public class ElementUnpacker
  private List<Element> PackCurtainWallElements(List<Element> elements)
  {
    var ids = elements.Select(el => el.Id).ToArray();
-    var doc = _revitContext.UIApplication?.ActiveUIDocument.Document!;
    elements.RemoveAll(element =>
-      (element is Mullion m && ids.Contains(m.Host.Id))
-      || (element is Panel p && ids.Contains(p.Host.Id))
-      || (
-        element is FamilyInstance { Host: not null } f
-        && doc.GetElement(f.Host.Id) is Wall { CurtainGrid: not null }
-        && ids.Contains(f.Host.Id)
-      )
+      (element is Mullion m && ids.Contains(m.Host.Id)) || (element is Panel p && ids.Contains(p.Host.Id))
    );
    return elements;
  }
@@ -2,11 +2,13 @@ using Autodesk.Revit.DB;
 using Speckle.Connectors.Common.Operations.Receive;
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Settings;
+using Speckle.Sdk.Models.GraphTraversal;

 namespace Speckle.Connectors.Revit.HostApp;

 /// <summary>
-/// Bakes all objects into a single top level group and pins it.
+/// <para>On receive, this class will help structure atomic objects into nested revit groups based on the hierarchy that they're coming from. Expects to be a scoped dependency per receive operation.</para>
+/// <para>How to use: during atomic object conversion, on each succesful conversion call <see cref="AddToGroupMapping"/>. Afterward, at the end of the recieve operation, call <see cref="BakeGroups"/> to actually create the groups in the revit document.</para>
 /// </summary>
 public class RevitGroupBaker : TraversalContextUnpacker
 {
@@ -19,15 +21,62 @@ public class RevitGroupBaker : TraversalContextUnpacker
    _revitUtils = revitUtils;
  }

-  private readonly List<ElementId> _elementIdsForTopLevelGroup = new();
-
-  public void AddToTopLevelGroup(Element revitElement) => _elementIdsForTopLevelGroup.Add(revitElement.Id);
-
-  public void BakeGroupForTopLevel(string baseGroupName)
+  /// <summary>
+  /// Adds the object to the correct group in preparation for <see cref="BakeGroups"/> at the end of the receive operation.
+  /// </summary>
+  /// <param name="traversalContext"></param>
+  /// <param name="revitElement"></param>
+  public void AddToGroupMapping(TraversalContext traversalContext, Element revitElement)
  {
-    var docGroup = _converterSettings.Current.Document.Create.NewGroup(_elementIdsForTopLevelGroup);
-    docGroup.GroupType.Name = _revitUtils.RemoveInvalidChars(baseGroupName);
-    docGroup.Pinned = true;
+    var collectionPath = GetCollectionPath(traversalContext);
+    var currentLayerName = string.Empty;
+    FakeGroup? previousGroup = null;
+    var currentDepth = 0;
+
+    foreach (var collection in collectionPath)
+    {
+      currentLayerName += collection.name + "-";
+      if (_groupCache.TryGetValue(currentLayerName, out var g))
+      {
+        previousGroup = g;
+        currentDepth++;
+        continue;
+      }
+
+      var group = new FakeGroup()
+      {
+        // POC group names should be unique
+        Name = _revitUtils.RemoveInvalidChars(currentLayerName[..^1]),
+        Depth = currentDepth++,
+        Parent = previousGroup!
+      };
+      _groupCache[currentLayerName] = group;
+      previousGroup = group;
+    }
+
+    previousGroup!.Ids.Add(revitElement.Id);
+  }
+
+  private readonly Dictionary<string, FakeGroup> _groupCache = new();
+
+  /// <summary>
+  /// Bakes the accumulated groups in Revit, with their objects.
+  /// </summary>
+  /// <param name="baseGroupName"></param>
+  public void BakeGroups(string baseGroupName)
+  {
+    var orderedGroups = _groupCache.Values.OrderByDescending(group => group.Depth);
+    Group? lastGroup = null;
+
+    foreach (var group in orderedGroups)
+    {
+      var docGroup = _converterSettings.Current.Document.Create.NewGroup(group.Ids);
+      group.Parent?.Ids.Add(docGroup.Id);
+      docGroup.GroupType.Name = group.Name;
+      lastGroup = docGroup;
+    }
+
+    lastGroup!.GroupType.Name = _revitUtils.RemoveInvalidChars(baseGroupName);
  }

  public void PurgeGroups(string baseGroupName)
@@ -37,23 +86,25 @@ public class RevitGroupBaker : TraversalContextUnpacker

    foreach (var group in groups)
    {
-      var subgroupTypeIds = new List<ElementId>() { group.GroupType.Id };
+      List<ElementId> subgroupTypeIds = new List<ElementId>();
      CollectSubGroupTypeIds(document, group, subgroupTypeIds);
      document.Delete(subgroupTypeIds);
    }
  }

-  private List<Group> GetGroupsByName(Document doc, string groupName)
+  private List<Group> GetGroupsByName(Autodesk.Revit.DB.Document doc, string groupName)
  {
    var validGroupName = _revitUtils.RemoveInvalidChars(groupName);

-    using var collector = new FilteredElementCollector(doc);
-    ICollection<Element> groupElements = collector.OfClass(typeof(Group)).ToElements();
-    List<Group> groups = groupElements.Cast<Group>().Where(g => g.GroupType.Name == validGroupName).ToList();
-    return groups;
+    using (var collector = new FilteredElementCollector(doc))
+    {
+      ICollection<Element> groupElements = collector.OfClass(typeof(Group)).ToElements();
+      List<Group> groups = groupElements.Cast<Group>().Where(g => g.GroupType.Name == validGroupName).ToList();
+      return groups;
+    }
  }

-  private void CollectSubGroupTypeIds(Document document, Group group, List<ElementId> subGroupTypeIds)
+  private void CollectSubGroupTypeIds(Autodesk.Revit.DB.Document document, Group group, List<ElementId> subGroupTypeIds)
  {
    ICollection<ElementId> groupMemberIds = group.GetMemberIds();

@@ -68,4 +119,15 @@ public class RevitGroupBaker : TraversalContextUnpacker
      }
    }
  }
+
+  /// <summary>
+  /// Little intermediate data structure that helps with the operations above.
+  /// </summary>
+  private sealed class FakeGroup
+  {
+    public List<ElementId> Ids { get; set; } = new();
+    public int Depth { get; set; }
+    public string Name { get; set; }
+    public FakeGroup Parent { get; set; }
+  }
 }
@@ -11,5 +11,5 @@ public interface ITransactionManager : IDisposable
  void StartSubtransaction();

  // POC improve how the error handling behaviour is selected
-  void StartTransaction(bool enableFailurePreprocessor = false, string name = "Speckle Transaction");
+  void StartTransaction(bool enableFailurePreprocessor = false);
 }
@@ -0,0 +1,9 @@
+using Revit.Async;
+using Speckle.Connectors.Common.Operations;
+
+namespace Speckle.Connectors.Revit.Operations.Receive;
+
+internal sealed class RevitContextAccessor : ISyncToThread
+{
+  public Task<T> RunOnThread<T>(Func<T> func) => RevitTask.RunAsync(func);
+}
@@ -4,22 +4,14 @@ using Revit.Async;
 using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Common.Operations.Receive;
 using Speckle.Connectors.Revit.HostApp;
 using Speckle.Converters.Common;
-using Speckle.Converters.Common.Objects;
-using Speckle.Converters.RevitShared;
 using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Converters.RevitShared.Settings;
-using Speckle.DoubleNumerics;
-using Speckle.Objects;
-using Speckle.Objects.Geometry;
 using Speckle.Sdk;
-using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
-using Transform = Speckle.Objects.Other.Transform;

 namespace Speckle.Connectors.Revit.Operations.Receive;

@@ -30,13 +22,10 @@ internal sealed class RevitHostObjectBuilder : IHostObjectBuilder, IDisposable
  private readonly RevitToHostCacheSingleton _revitToHostCacheSingleton;
  private readonly ITransactionManager _transactionManager;
  private readonly ILocalToGlobalUnpacker _localToGlobalUnpacker;
+  private readonly LocalToGlobalConverterUtils _localToGlobalConverterUtils;
  private readonly RevitGroupBaker _groupBaker;
  private readonly RevitMaterialBaker _materialBaker;
  private readonly ILogger<RevitHostObjectBuilder> _logger;
-  private readonly ITypedConverter<
-    (Base atomicObject, List<Matrix4x4> matrix),
-    DirectShape
-  > _localToGlobalDirectShapeConverter;

  private readonly RootObjectUnpacker _rootObjectUnpacker;
  private readonly ISdkActivityFactory _activityFactory;
@@ -47,24 +36,24 @@ internal sealed class RevitHostObjectBuilder : IHostObjectBuilder, IDisposable
    ITransactionManager transactionManager,
    ISdkActivityFactory activityFactory,
    ILocalToGlobalUnpacker localToGlobalUnpacker,
+    LocalToGlobalConverterUtils localToGlobalConverterUtils,
    RevitGroupBaker groupManager,
    RevitMaterialBaker materialBaker,
    RootObjectUnpacker rootObjectUnpacker,
    ILogger<RevitHostObjectBuilder> logger,
-    RevitToHostCacheSingleton revitToHostCacheSingleton,
-    ITypedConverter<(Base atomicObject, List<Matrix4x4> matrix), DirectShape> localToGlobalDirectShapeConverter
+    RevitToHostCacheSingleton revitToHostCacheSingleton
  )
  {
    _converter = converter;
    _converterSettings = converterSettings;
    _transactionManager = transactionManager;
    _localToGlobalUnpacker = localToGlobalUnpacker;
+    _localToGlobalConverterUtils = localToGlobalConverterUtils;
    _groupBaker = groupManager;
    _materialBaker = materialBaker;
    _rootObjectUnpacker = rootObjectUnpacker;
    _logger = logger;
    _revitToHostCacheSingleton = revitToHostCacheSingleton;
-    _localToGlobalDirectShapeConverter = localToGlobalDirectShapeConverter;
    _activityFactory = activityFactory;
  }

@@ -72,7 +61,7 @@ internal sealed class RevitHostObjectBuilder : IHostObjectBuilder, IDisposable
    Base rootObject,
    string projectName,
    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed,
    CancellationToken cancellationToken
  ) =>
    RevitTask.RunAsync(() => BuildSync(rootObject, projectName, modelName, onOperationProgressed, cancellationToken));
@@ -81,29 +70,33 @@ internal sealed class RevitHostObjectBuilder : IHostObjectBuilder, IDisposable
    Base rootObject,
    string projectName,
    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed,
    CancellationToken cancellationToken
  )
  {
    var baseGroupName = $"Project {projectName}: Model {modelName}"; // TODO: unify this across connectors!

-    onOperationProgressed.Report(new("Converting", null));
+    onOperationProgressed?.Invoke("Converting", null);
    using var activity = _activityFactory.Start("Build");

    // 0 - Clean then Rock n Roll! 🎸
-    {
-      _activityFactory.Start("Pre receive clean");
-      _transactionManager.StartTransaction(true, "Pre receive clean");
-      try
-      {
-        PreReceiveDeepClean(baseGroupName);
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, "Failed to clean up before receive in Revit");
-      }
+    using TransactionGroup preReceiveCleanTransaction = new(_converterSettings.Current.Document, "Pre-receive clean");
+    preReceiveCleanTransaction.Start();
+    _transactionManager.StartTransaction(true);

+    try
+    {
+      PreReceiveDeepClean(baseGroupName);
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      _logger.LogError(ex, "Failed to clean up before receive in Revit");
+    }
+
+    using (var _ = _activityFactory.Start("Commit"))
+    {
      _transactionManager.CommitTransaction();
+      preReceiveCleanTransaction.Assimilate();
    }

    // 1 - Unpack objects and proxies from root commit object
@@ -113,56 +106,57 @@ internal sealed class RevitHostObjectBuilder : IHostObjectBuilder, IDisposable
      unpackedRoot.ObjectsToConvert.ToList()
    );

-    // 2 - Bake materials
+    using TransactionGroup transactionGroup =
+      new(_converterSettings.Current.Document, $"Received data from {projectName}");
+    transactionGroup.Start();
+    _transactionManager.StartTransaction();
+
    if (unpackedRoot.RenderMaterialProxies != null)
    {
-      _transactionManager.StartTransaction(true, "Baking materials");
      _materialBaker.MapLayersRenderMaterials(unpackedRoot);
+      // NOTE: do not set _contextStack.RenderMaterialProxyCache directly, things stop working. Ogu/Dim do not know why :) not a problem as we hopefully will refactor some of these hacks out.
      var map = _materialBaker.BakeMaterials(unpackedRoot.RenderMaterialProxies, baseGroupName);
      foreach (var kvp in map)
      {
        _revitToHostCacheSingleton.MaterialsByObjectId.Add(kvp.Key, kvp.Value);
      }
-      _transactionManager.CommitTransaction();
    }

-    // 3 - Bake objects
-    (
-      HostObjectBuilderResult builderResult,
-      List<(DirectShape res, string applicationId)> postBakePaintTargets
-    ) conversionResults;
+    var conversionResults = BakeObjects(localToGlobalMaps, onOperationProgressed, cancellationToken);
+
+    using (var _ = _activityFactory.Start("Commit"))
    {
-      using var _ = _activityFactory.Start("Baking objects");
-      _transactionManager.StartTransaction(true, "Baking objects");
-      conversionResults = BakeObjects(localToGlobalMaps, onOperationProgressed, cancellationToken);
      _transactionManager.CommitTransaction();
+      transactionGroup.Assimilate();
    }

-    // 4 - Paint solids
+    using TransactionGroup createGroupTransaction = new(_converterSettings.Current.Document, "Creating group");
+    createGroupTransaction.Start();
+    _transactionManager.StartTransaction(true);
+
+    try
    {
-      using var _ = _activityFactory.Start("Painting solids");
-      _transactionManager.StartTransaction(true, "Painting solids");
-      PostBakePaint(conversionResults.postBakePaintTargets);
-      _transactionManager.CommitTransaction();
+      _groupBaker.BakeGroups(baseGroupName);
    }
-
-    // 5 - Create group
+    catch (Exception ex) when (!ex.IsFatal())
    {
-      using var _ = _activityFactory.Start("Grouping");
-      _transactionManager.StartTransaction(true, "Grouping");
-      _groupBaker.BakeGroupForTopLevel(baseGroupName);
-      _transactionManager.CommitTransaction();
+      _logger.LogError(ex, "Failed to create group after receiving elements in Revit");
    }

-    return conversionResults.builderResult;
+    using (var _ = _activityFactory.Start("Commit"))
+    {
+      _transactionManager.CommitTransaction();
+      createGroupTransaction.Assimilate();
+    }
+
+    _revitToHostCacheSingleton.MaterialsByObjectId.Clear(); // Massive hack!
+
+    return conversionResults;
  }

-  private (
-    HostObjectBuilderResult builderResult,
-    List<(DirectShape res, string applicationId)> postBakePaintTargets
-  ) BakeObjects(
+  private HostObjectBuilderResult BakeObjects(
    List<LocalToGlobalMap> localToGlobalMaps,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed,
    CancellationToken cancellationToken
  )
  {
@@ -171,111 +165,47 @@ internal sealed class RevitHostObjectBuilder : IHostObjectBuilder, IDisposable
    var bakedObjectIds = new List<string>();
    int count = 0;

-    var postBakePaintTargets = new List<(DirectShape res, string applicationId)>();
-
    foreach (LocalToGlobalMap localToGlobalMap in localToGlobalMaps)
    {
      cancellationToken.ThrowIfCancellationRequested();
      try
      {
        using var activity = _activityFactory.Start("BakeObject");
+        var atomicObject = _localToGlobalConverterUtils.TransformObjects(
+          localToGlobalMap.AtomicObject,
+          localToGlobalMap.Matrix
+        );
+        var result = _converter.Convert(atomicObject);
+        onOperationProgressed?.Invoke("Converting", (double)++count / localToGlobalMaps.Count);

-        // POC hack of the ages: try to pre transform curves before baking
-        // we need to bypass the local to global converter as there we don't have access to what we want. that service will/should stop existing.
-        if (
-          localToGlobalMap.AtomicObject is ITransformable transformable and ICurve
-          && localToGlobalMap.Matrix.Count > 0
-          && localToGlobalMap.AtomicObject["units"] is string units
-        )
+        // Note: our current converter always returns a DS for now
+        if (result is DirectShape ds)
        {
-          ITransformable? newTransformable = null;
-          foreach (var mat in localToGlobalMap.Matrix)
-          {
-            transformable.TransformTo(new Transform(mat, units), out newTransformable);
-          }
-
-          localToGlobalMap.AtomicObject = (newTransformable as Base)!;
-          localToGlobalMap.Matrix = new(); // flush out the list, as we've applied the transforms already
-        }
-
-        // actual conversion happens here!
-        var result = _converter.Convert(localToGlobalMap.AtomicObject);
-        onOperationProgressed.Report(new("Converting", (double)++count / localToGlobalMaps.Count));
-        if (result is DirectShapeDefinitionWrapper)
-        {
-          // direct shape creation happens here
-          DirectShape directShapes = _localToGlobalDirectShapeConverter.Convert(
-            (localToGlobalMap.AtomicObject, localToGlobalMap.Matrix)
-          );
-
-          bakedObjectIds.Add(directShapes.UniqueId);
-          _groupBaker.AddToTopLevelGroup(directShapes);
-
-          if (localToGlobalMap.AtomicObject is IRawEncodedObject and Base myBase)
-          {
-            postBakePaintTargets.Add((directShapes, myBase.applicationId ?? myBase.id));
-          }
-
-          conversionResults.Add(
-            new(Status.SUCCESS, localToGlobalMap.AtomicObject, directShapes.UniqueId, "Direct Shape")
-          );
+          bakedObjectIds.Add(ds.UniqueId.ToString());
+          _groupBaker.AddToGroupMapping(localToGlobalMap.TraversalContext, ds);
        }
        else
        {
-          throw new ConversionException($"Failed to cast {result.GetType()} to direct shape definition wrapper.");
+          throw new SpeckleConversionException($"Failed to cast {result.GetType()} to Direct Shape.");
        }
+        conversionResults.Add(new(Status.SUCCESS, atomicObject, ds.UniqueId, "Direct Shape"));
      }
      catch (Exception ex) when (!ex.IsFatal())
      {
        conversionResults.Add(new(Status.ERROR, localToGlobalMap.AtomicObject, null, null, ex));
-        _logger.LogError(ex, $"Failed to convert object of type {localToGlobalMap.AtomicObject.speckle_type}");
-      }
-    }
-    return (new(bakedObjectIds, conversionResults), postBakePaintTargets);
-  }
-
-  /// <summary>
-  /// We're using this to assign materials to solids coming via the shape importer.
-  /// </summary>
-  /// <param name="paintTargets"></param>
-  private void PostBakePaint(List<(DirectShape res, string applicationId)> paintTargets)
-  {
-    foreach (var (res, applicationId) in paintTargets)
-    {
-      var elGeometry = res.get_Geometry(new Options() { DetailLevel = ViewDetailLevel.Undefined });
-      var materialId = ElementId.InvalidElementId;
-      if (_revitToHostCacheSingleton.MaterialsByObjectId.TryGetValue(applicationId, out var mappedElementId))
-      {
-        materialId = mappedElementId;
-      }
-
-      if (materialId == ElementId.InvalidElementId)
-      {
-        continue;
-      }
-
-      // NOTE: some geometries fail to convert as solids, and the api defaults back to meshes (from the shape importer). These cannot be painted, so don't bother.
-      foreach (var geo in elGeometry)
-      {
-        if (geo is Solid s)
-        {
-          foreach (Face face in s.Faces)
-          {
-            _converterSettings.Current.Document.Paint(res.Id, face, materialId);
-          }
-        }
      }
    }
+    return new(bakedObjectIds, conversionResults);
  }

  private void PreReceiveDeepClean(string baseGroupName)
  {
-    DirectShapeLibrary.GetDirectShapeLibrary(_converterSettings.Current.Document).Reset(); // Note: this needs to be cleared, as it is being used in the converter
-
-    _revitToHostCacheSingleton.MaterialsByObjectId.Clear(); // Massive hack!
    _groupBaker.PurgeGroups(baseGroupName);
    _materialBaker.PurgeMaterials(baseGroupName);
  }

-  public void Dispose() => _transactionManager?.Dispose();
+  public void Dispose()
+  {
+    _transactionManager?.Dispose();
+  }
 }
@@ -30,11 +30,11 @@ public sealed class TransactionManager : ITransactionManager
 #pragma warning restore CA2213 // Disposable fields should be disposed

  // POC find a better way to use IFailuresPreprocessor
-  public void StartTransaction(bool enableFailurePreprocessor = false, string name = "Speckle Transaction")
+  public void StartTransaction(bool enableFailurePreprocessor = false)
  {
    if (_transaction == null || !_transaction.IsValidObject || _transaction.GetStatus() != TransactionStatus.Started)
    {
-      _transaction = new Transaction(Document, name);
+      _transaction = new Transaction(Document, "Speckle Transaction");

      if (enableFailurePreprocessor)
      {
@@ -23,6 +23,7 @@ public class RevitRootObjectBuilder : IRootObjectBuilder<ElementId>
  // POC: SendSelection and RevitConversionContextStack should be interfaces, former needs interfaces
  private readonly IRootToSpeckleConverter _converter;
  private readonly IConverterSettingsStore<RevitConversionSettings> _converterSettings;
+  private readonly Collection _rootObject;
  private readonly ISendConversionCache _sendConversionCache;
  private readonly ElementUnpacker _elementUnpacker;
  private readonly SendCollectionManager _sendCollectionManager;
@@ -49,12 +50,18 @@ public class RevitRootObjectBuilder : IRootObjectBuilder<ElementId>
    _revitToSpeckleCacheSingleton = revitToSpeckleCacheSingleton;
    _logger = logger;
    _parameterDefinitionHandler = parameterDefinitionHandler;
+
+    _rootObject = new Collection()
+    {
+      name = _converterSettings.Current.Document.PathName.Split('\\').Last().Split('.').First()
+    };
+    _rootObject["units"] = _converterSettings.Current.SpeckleUnits;
  }

  public async Task<RootObjectBuilderResult> Build(
    IReadOnlyList<ElementId> objects,
    SendInfo sendInfo,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed = null,
    CancellationToken ct = default
  )
  {
@@ -65,11 +72,6 @@ public class RevitRootObjectBuilder : IRootObjectBuilder<ElementId>
      throw new SpeckleException("Family Environment documents are not supported.");
    }

-    // 0 - Init the root
-    Collection rootObject =
-      new() { name = _converterSettings.Current.Document.PathName.Split('\\').Last().Split('.').First() };
-    rootObject["units"] = _converterSettings.Current.SpeckleUnits;
-
    var revitElements = new List<Element>();

    // Convert ids to actual revit elements
@@ -114,8 +116,7 @@ public class RevitRootObjectBuilder : IRootObjectBuilder<ElementId>
          converted.applicationId = applicationId;
        }

-        var collection = _sendCollectionManager.GetAndCreateObjectHostCollection(revitElement, rootObject);
-
+        var collection = _sendCollectionManager.GetAndCreateObjectHostCollection(revitElement, _rootObject);
        collection.elements.Add(converted);
        results.Add(new(Status.SUCCESS, applicationId, sourceType, converted));
      }
@@ -125,20 +126,20 @@ public class RevitRootObjectBuilder : IRootObjectBuilder<ElementId>
        results.Add(new(Status.ERROR, applicationId, sourceType, null, ex));
      }

-      onOperationProgressed.Report(new("Converting", (double)++countProgress / atomicObjects.Count));
+      onOperationProgressed?.Invoke("Converting", (double)++countProgress / atomicObjects.Count);
    }

    if (results.All(x => x.Status == Status.ERROR))
    {
-      throw new SpeckleException("Failed to convert all objects.");
+      throw new SpeckleConversionException("Failed to convert all objects.");
    }

    var idsAndSubElementIds = _elementUnpacker.GetElementsAndSubelementIdsFromAtomicObjects(atomicObjects);
    var materialProxies = _revitToSpeckleCacheSingleton.GetRenderMaterialProxyListForObjects(idsAndSubElementIds);
-    rootObject[ProxyKeys.RENDER_MATERIAL] = materialProxies;
+    _rootObject[ProxyKeys.RENDER_MATERIAL] = materialProxies;
    // NOTE: these are currently not used anywhere, so we could even skip them (?).
-    rootObject[ProxyKeys.PARAMETER_DEFINITIONS] = _parameterDefinitionHandler.Definitions;
+    _rootObject[ProxyKeys.PARAMETER_DEFINITIONS] = _parameterDefinitionHandler.Definitions;

-    return new RootObjectBuilderResult(rootObject, results);
+    return new RootObjectBuilderResult(_rootObject, results);
  }
 }
@@ -2,41 +2,43 @@ using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Events;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Converters.RevitShared.Helpers;
+using Speckle.InterfaceGenerator;
+using Speckle.Sdk;
 using Speckle.Sdk.Common;

 namespace Speckle.Connectors.Revit.Plugin;

-public interface IRevitIdleManager : IAppIdleManager
-{
-  public void RunAsync(Action action);
-}
-
-public sealed class RevitIdleManager(
-  RevitContext revitContext,
-  IIdleCallManager idleCallManager,
-  ITopLevelExceptionHandler topLevelExceptionHandler
-) : AppIdleManager(idleCallManager), IRevitIdleManager
+[GenerateAutoInterface]
+public sealed class RevitIdleManager(RevitContext revitContext, IIdleCallManager idleCallManager) : IRevitIdleManager
 {
  private readonly UIApplication _uiApplication = revitContext.UIApplication.NotNull();
-  private readonly IIdleCallManager _idleCallManager = idleCallManager;

-  protected override void AddEvent()
-  {
-    topLevelExceptionHandler.CatchUnhandled(() =>
-    {
-      try
+  /// <summary>
+  /// Subscribe deferred action to Idling event to run it whenever Revit becomes idle.
+  /// </summary>
+  /// <param name="action"> Action to call whenever Revit becomes Idle.</param>
+  /// some events in host app are trigerred many times, we might get 10x per object
+  /// Making this more like a deferred action, so we don't update the UI many times
+  public void SubscribeToIdle(string id, Action action) =>
+    idleCallManager.SubscribeToIdle(
+      id,
+      action,
+      () =>
      {
-        _uiApplication.Idling += RevitAppOnIdle;
+        try
+        {
+          _uiApplication.Idling += RevitAppOnIdle;
+        }
+        catch (Exception e) when (!e.IsFatal())
+        {
+          // TODO: wrap this guy in the top level exception handler (?)
+          // This happens very rarely, see previous report [CNX-125: Autodesk.Revit.Exceptions.InvalidOperationException: Can not subscribe to an event during execution of that event!](https://linear.app/speckle/issue/CNX-125/autodeskrevitexceptionsinvalidoperationexception-can-not-subscribe-to)
+        }
      }
-      catch (Autodesk.Revit.Exceptions.InvalidOperationException)
-      {
-        // This happens very rarely, see previous report [CNX-125: Autodesk.Revit.Exceptions.InvalidOperationException: Can not subscribe to an event during execution of that event!](https://linear.app/speckle/issue/CNX-125/autodeskrevitexceptionsinvalidoperationexception-can-not-subscribe-to)
-      }
-    });
-  }
+    );

  private void RevitAppOnIdle(object? sender, IdlingEventArgs e) =>
-    _idleCallManager.AppOnIdle(() => _uiApplication.Idling -= RevitAppOnIdle);
+    idleCallManager.AppOnIdle(() => _uiApplication.Idling -= RevitAppOnIdle);

  public void RunAsync(Action action)
  {
@@ -33,6 +33,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\SendCollectionManager.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\ElementUnpacker.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\ITransactionManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\RevitContextAccessor.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\RevitHostObjectBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\TransactionManager.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\RevitRootObjectBuilder.cs" />
@@ -283,8 +283,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -292,7 +292,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -310,7 +310,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "speckle.converters.rhino7": {
@@ -355,18 +355,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -3,7 +3,7 @@
    "Speckle.Connectors.Rhino8": {
      "commandName": "Executable",
      "executablePath": "C:\\Program Files\\Rhino 8\\System\\Rhino.exe",
-      "commandLineArgs": "\"$(TargetDir)Speckle.Connectors.Rhino8.rhp\" /netfx"
+      "commandLineArgs": "\"$(TargetDir)Speckle.Connectors.Rhino8.rhp\""
    }
  }
 }
@@ -283,8 +283,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -292,7 +292,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -310,7 +310,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "speckle.converters.rhino8": {
@@ -355,18 +355,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -1,7 +1,6 @@
 using Rhino;
 using Rhino.DocObjects;
 using Rhino.Geometry;
-using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
@@ -12,36 +11,30 @@ using Speckle.Sdk.Common;

 namespace Speckle.Connectors.Rhino.Bindings;

-public sealed class RhinoBasicConnectorBinding : IBasicConnectorBinding
+public class RhinoBasicConnectorBinding : IBasicConnectorBinding
 {
  public string Name => "baseBinding";
  public IBrowserBridge Parent { get; }
  public BasicConnectorBindingCommands Commands { get; }

  private readonly DocumentModelStore _store;
-  private readonly ISendConversionCache _sendConversionCache;
  private readonly ISpeckleApplication _speckleApplication;

  public RhinoBasicConnectorBinding(
    DocumentModelStore store,
    IBrowserBridge parent,
-    ISendConversionCache sendConversionCache,
    ISpeckleApplication speckleApplication
  )
  {
    _store = store;
    Parent = parent;
-    _sendConversionCache = sendConversionCache;
    _speckleApplication = speckleApplication;
    Commands = new BasicConnectorBindingCommands(parent);

    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged().ConfigureAwait(false);
-        // Note: this prevents scaling issues when copy-pasting from one rhino doc to another in the same session.
-        _sendConversionCache.ClearCache();
-      });
+    {
+      Commands.NotifyDocumentChanged();
+    };
  }

  public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
@@ -67,7 +60,7 @@ public sealed class RhinoBasicConnectorBinding : IBasicConnectorBinding

  public void RemoveModel(ModelCard model) => _store.RemoveModel(model);

-  public Task HighlightObjects(IReadOnlyList<string> objectIds)
+  public void HighlightObjects(List<string> objectIds)
  {
    var objects = GetObjectsFromIds(objectIds);

@@ -80,10 +73,9 @@ public sealed class RhinoBasicConnectorBinding : IBasicConnectorBinding
    }

    HighlightObjectsOnView(objects.rhinoObjects, objects.groups);
-    return Task.CompletedTask;
  }

-  public async Task HighlightModel(string modelCardId)
+  public void HighlightModel(string modelCardId)
  {
    var objectIds = new List<string>();
    var myModel = _store.GetModelById(modelCardId);
@@ -100,9 +92,7 @@ public sealed class RhinoBasicConnectorBinding : IBasicConnectorBinding

    if (objectIds.Count == 0)
    {
-      await Commands
-        .SetModelError(modelCardId, new OperationCanceledException("No objects found to highlight."))
-        .ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, new OperationCanceledException("No objects found to highlight."));
      return;
    }

@@ -112,16 +102,14 @@ public sealed class RhinoBasicConnectorBinding : IBasicConnectorBinding

    if (objects.rhinoObjects.Count == 0 && objects.groups.Count == 0)
    {
-      await Commands
-        .SetModelError(modelCardId, new OperationCanceledException("No objects found to highlight."))
-        .ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, new OperationCanceledException("No objects found to highlight."));
      return;
    }

    HighlightObjectsOnView(objects.rhinoObjects, objects.groups);
  }

-  private (List<RhinoObject> rhinoObjects, List<Group> groups) GetObjectsFromIds(IReadOnlyList<string> objectIds)
+  private (List<RhinoObject> rhinoObjects, List<Group> groups) GetObjectsFromIds(List<string> objectIds)
  {
    List<RhinoObject> rhinoObjects = objectIds
      .Select((id) => RhinoDoc.ActiveDoc.Objects.FindId(new Guid(id)))
@@ -9,6 +9,8 @@ using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
+using Speckle.Connectors.DUI.Settings;
+using Speckle.Connectors.Rhino.Operations.Send.Settings;
 using Speckle.Converters.Common;
 using Speckle.Converters.Rhino;
 using Speckle.Sdk;
@@ -51,6 +53,10 @@ public class RhinoReceiveBinding : IReceiveBinding
    Commands = new ReceiveBindingUICommands(parent);
  }

+#pragma warning disable CA1024
+  public List<ICardSetting> GetReceiveSettings() => [new EnableLiveSession(false)];
+#pragma warning restore CA1024
+
  public void CancelReceive(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);

  public async Task Receive(string modelCardId)
@@ -75,15 +81,23 @@ public class RhinoReceiveBinding : IReceiveBinding
        .ServiceProvider.GetRequiredService<ReceiveOperation>()
        .Execute(
          modelCard.GetReceiveInfo(_speckleApplication.Slug),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
-          cancellationToken
+          cancellationToken,
+          (status, progress) =>
+            _operationProgressManager.SetModelProgress(
+              Parent,
+              modelCardId,
+              new ModelCardProgress(modelCardId, status, progress),
+              cancellationToken
+            )
        )
        .ConfigureAwait(false);

      modelCard.BakedObjectIds = conversionResults.BakedObjectIds.ToList();
-      await Commands
-        .SetModelReceiveResult(modelCardId, conversionResults.BakedObjectIds, conversionResults.ConversionResults)
-        .ConfigureAwait(false);
+      Commands.SetModelReceiveResult(
+        modelCardId,
+        conversionResults.BakedObjectIds,
+        conversionResults.ConversionResults
+      );
    }
    catch (OperationCanceledException)
    {
@@ -95,7 +109,7 @@ public class RhinoReceiveBinding : IReceiveBinding
    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
    {
      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, ex);
    }
  }

@@ -2,18 +2,19 @@ using Rhino;
 using Rhino.DocObjects;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.Rhino.HostApp;

 namespace Speckle.Connectors.Rhino.Bindings;

 public class RhinoSelectionBinding : ISelectionBinding
 {
-  private readonly IAppIdleManager _idleManager;
+  private readonly IRhinoIdleManager _idleManager;
  private const string SELECTION_EVENT = "setSelection";

  public string Name => "selectionBinding";
  public IBrowserBridge Parent { get; }

-  public RhinoSelectionBinding(IAppIdleManager idleManager, IBrowserBridge parent)
+  public RhinoSelectionBinding(IRhinoIdleManager idleManager, IBrowserBridge parent)
  {
    _idleManager = idleManager;
    Parent = parent;
@@ -15,11 +15,12 @@ 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.Rhino.HostApp;
+using Speckle.Connectors.Rhino.Operations.Send.Settings;
 using Speckle.Converters.Common;
 using Speckle.Converters.Rhino;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
-using Speckle.Sdk.Logging;

 namespace Speckle.Connectors.Rhino.Bindings;

@@ -30,7 +31,7 @@ public sealed class RhinoSendBinding : ISendBinding
  public IBrowserBridge Parent { get; }

  private readonly DocumentModelStore _store;
-  private readonly IAppIdleManager _idleManager;
+  private readonly IRhinoIdleManager _idleManager;
  private readonly IServiceProvider _serviceProvider;
  private readonly List<ISendFilter> _sendFilters;
  private readonly CancellationManager _cancellationManager;
@@ -40,7 +41,6 @@ public sealed class RhinoSendBinding : ISendBinding
  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
  private readonly IRhinoConversionSettingsFactory _rhinoConversionSettingsFactory;
  private readonly ISpeckleApplication _speckleApplication;
-  private readonly ISdkActivityFactory _activityFactory;

  /// <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:
@@ -52,7 +52,7 @@ public sealed class RhinoSendBinding : ISendBinding

  public RhinoSendBinding(
    DocumentModelStore store,
-    IAppIdleManager idleManager,
+    IRhinoIdleManager idleManager,
    IBrowserBridge parent,
    IEnumerable<ISendFilter> sendFilters,
    IServiceProvider serviceProvider,
@@ -61,8 +61,7 @@ public sealed class RhinoSendBinding : ISendBinding
    IOperationProgressManager operationProgressManager,
    ILogger<RhinoSendBinding> logger,
    IRhinoConversionSettingsFactory rhinoConversionSettingsFactory,
-    ISpeckleApplication speckleApplication,
-    ISdkActivityFactory activityFactory
+    ISpeckleApplication speckleApplication
  )
  {
    _store = store;
@@ -78,7 +77,6 @@ public sealed class RhinoSendBinding : ISendBinding
    _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;
    SubscribeToRhinoEvents();
  }

@@ -97,11 +95,10 @@ public sealed class RhinoSendBinding : ISendBinding
      _topLevelExceptionHandler.CatchUnhandled(() =>
      {
        // NOTE: This does not work if rhino starts and opens a blank doc;
-        // These events always happen in a doc. Why guard agains a null doc?
-        // if (!_store.IsDocumentInit)
-        // {
-        //   return;
-        // }
+        if (!_store.IsDocumentInit)
+        {
+          return;
+        }

        ChangedObjectIds[e.ObjectId.ToString()] = 1;
        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
@@ -111,11 +108,10 @@ public sealed class RhinoSendBinding : ISendBinding
      _topLevelExceptionHandler.CatchUnhandled(() =>
      {
        // NOTE: This does not work if rhino starts and opens a blank doc;
-        // These events always happen in a doc. Why guard agains a null doc?
-        // if (!_store.IsDocumentInit)
-        // {
-        //   return;
-        // }
+        if (!_store.IsDocumentInit)
+        {
+          return;
+        }

        ChangedObjectIds[e.ObjectId.ToString()] = 1;
        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
@@ -125,11 +121,10 @@ public sealed class RhinoSendBinding : ISendBinding
      _topLevelExceptionHandler.CatchUnhandled(() =>
      {
        // NOTE: This does not work if rhino starts and opens a blank doc;
-        // These events always happen in a doc. Why guard agains a null doc?
-        // if (!_store.IsDocumentInit)
-        // {
-        //   return;
-        // }
+        if (!_store.IsDocumentInit)
+        {
+          return;
+        }

        // NOTE: not sure yet we want to track every attribute changes yet. TBD
        if (e.OldAttributes.LayerIndex != e.NewAttributes.LayerIndex)
@@ -143,11 +138,10 @@ public sealed class RhinoSendBinding : ISendBinding
      _topLevelExceptionHandler.CatchUnhandled(() =>
      {
        // NOTE: This does not work if rhino starts and opens a blank doc;
-        // These events always happen in a doc. Why guard agains a null doc?
-        // if (!_store.IsDocumentInit)
-        // {
-        //   return;
-        // }
+        if (!_store.IsDocumentInit)
+        {
+          return;
+        }

        ChangedObjectIds[e.NewRhinoObject.Id.ToString()] = 1;
        ChangedObjectIds[e.OldRhinoObject.Id.ToString()] = 1;
@@ -157,11 +151,10 @@ public sealed class RhinoSendBinding : ISendBinding

  public List<ISendFilter> GetSendFilters() => _sendFilters;

-  public List<ICardSetting> GetSendSettings() => [];
+  public List<ICardSetting> GetSendSettings() => [new EnableLiveSession(false)];

  public async Task Send(string modelCardId)
  {
-    using var activity = _activityFactory.Start();
    using var scope = _serviceProvider.CreateScope();
    scope
      .ServiceProvider.GetRequiredService<IConverterSettingsStore<RhinoConversionSettings>>()
@@ -194,14 +187,18 @@ public sealed class RhinoSendBinding : ISendBinding
        .Execute(
          rhinoObjects,
          modelCard.GetSendInfo(_speckleApplication.Slug),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
+          (status, progress) =>
+            _operationProgressManager.SetModelProgress(
+              Parent,
+              modelCardId,
+              new ModelCardProgress(modelCardId, status, progress),
+              cancellationToken
+            ),
          cancellationToken
        )
        .ConfigureAwait(false);

-      await Commands
-        .SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults)
-        .ConfigureAwait(false);
+      Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
    }
    catch (OperationCanceledException)
    {
@@ -213,7 +210,7 @@ public sealed class RhinoSendBinding : ISendBinding
    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
    {
      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      Commands.SetModelError(modelCardId, ex);
    }
  }

@@ -222,14 +219,8 @@ public sealed class RhinoSendBinding : ISendBinding
  /// <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 void RunExpirationChecks()
  {
-    // Note: added here a guard against executing this if there's no active doc present.
-    if (RhinoDoc.ActiveDoc == null)
-    {
-      _logger.LogError("Rhino expiration checks were running without an active doc.");
-      return;
-    }
    var senders = _store.GetSenders();
    string[] objectIdsList = ChangedObjectIds.Keys.ToArray(); // NOTE: could not copy to array happens here
    List<string> expiredSenderIds = new();
@@ -246,7 +237,7 @@ public sealed class RhinoSendBinding : ISendBinding
      }
    }

-    await Commands.SetModelsExpired(expiredSenderIds).ConfigureAwait(false);
+    Commands.SetModelsExpired(expiredSenderIds);
    ChangedObjectIds = new();
  }
 }
@@ -1,6 +1,6 @@
 using Rhino;
+using Speckle.Sdk;
 using Speckle.Sdk.Common;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Connectors.Rhino.Extensions;

@@ -31,7 +31,7 @@ public static class RhinoUnitsExtension
      case UnitSystem.Unset:
        return Units.Meters;
      default:
-        throw new UnitNotSupportedException($"The Unit System \"{unitSystem}\" is unsupported.");
+        throw new SpeckleException($"The Unit System \"{unitSystem}\" is unsupported.");
    }
  }
 }
@@ -1,20 +1,29 @@
 using Rhino;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.InterfaceGenerator;

 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)
+[GenerateAutoInterface]
+public class RhinoIdleManager(IIdleCallManager idleCallManager) : IRhinoIdleManager
 {
-  private readonly IIdleCallManager _idleCallManager = idleCallManager;
-
-  protected override void AddEvent()
-  {
-    RhinoApp.Idle += RhinoAppOnIdle;
-  }
+  /// <summary>
+  /// Subscribe deferred action to RhinoIdle event to run it whenever Rhino become idle.
+  /// </summary>
+  /// <param name="action"> Action to call whenever Rhino become Idle.</param>
+  public void SubscribeToIdle(string id, Action action) =>
+    idleCallManager.SubscribeToIdle(
+      id,
+      action,
+      () =>
+      {
+        RhinoApp.Idle += RhinoAppOnIdle;
+      }
+    );

  private void RhinoAppOnIdle(object? sender, EventArgs e) =>
-    _idleCallManager.AppOnIdle(() => RhinoApp.Idle -= RhinoAppOnIdle);
+    idleCallManager.AppOnIdle(() => RhinoApp.Idle -= RhinoAppOnIdle);
 }
@@ -4,12 +4,10 @@ using Rhino.DocObjects;
 using Rhino.Geometry;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Rhino.Extensions;
 using Speckle.DoubleNumerics;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
-using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
@@ -42,11 +40,11 @@ public class RhinoInstanceBaker : IInstanceBaker<List<string>>
  /// <param name="instanceComponents">Instance definitions and instances that need creating.</param>
  /// <param name="applicationIdMap">A dict mapping { original application id -> [resulting application ids post conversion] }</param>
  /// <param name="onOperationProgressed"></param>
-  public async Task<BakeResult> BakeInstances(
-    IReadOnlyCollection<(Collection[] collectionPath, IInstanceComponent obj)> instanceComponents,
+  public BakeResult BakeInstances(
+    List<(Collection[] collectionPath, IInstanceComponent obj)> instanceComponents,
    Dictionary<string, List<string>> applicationIdMap,
    string baseLayerName,
-    IProgress<CardProgress> onOperationProgressed
+    Action<string, double?>? onOperationProgressed
  )
  {
    // var doc = _contextStack.Current.Document;
@@ -64,7 +62,7 @@ public class RhinoInstanceBaker : IInstanceBaker<List<string>>
    var consumedObjectIds = new List<string>();
    foreach (var (layerCollection, instanceOrDefinition) in sortedInstanceComponents)
    {
-      onOperationProgressed.Report(new("Converting blocks", (double)++count / sortedInstanceComponents.Count));
+      onOperationProgressed?.Invoke("Converting blocks", (double)++count / sortedInstanceComponents.Count);
      try
      {
        if (instanceOrDefinition is InstanceDefinitionProxy definitionProxy)
@@ -156,7 +154,6 @@ public class RhinoInstanceBaker : IInstanceBaker<List<string>>
      }
    }

-    await Task.Yield();
    return new(createdObjectIds, consumedObjectIds, conversionResults);
  }

@@ -46,7 +46,8 @@ public class RhinoLayerBaker : TraversalContextUnpacker

    var currentLayerName = baseLayerName;
    var currentDocument = RhinoDoc.ActiveDoc; // POC: too much effort right now to wrap around the interfaced layers
-    Layer? previousLayer = currentDocument.Layers.FindName(currentLayerName);
+    Layer previousLayer = currentDocument.Layers.FindName(currentLayerName);
+
    foreach (Collection collection in collectionPath)
    {
      currentLayerName += Layer.PathSeparator + collection.name;
@@ -58,7 +59,7 @@ public class RhinoLayerBaker : TraversalContextUnpacker
      }

      var cleanNewLayerName = collection.name.Replace("{", "").Replace("}", "");
-      Layer newLayer = new() { Name = cleanNewLayerName, ParentLayerId = previousLayer?.Id ?? Guid.Empty };
+      Layer newLayer = new() { Name = cleanNewLayerName, ParentLayerId = previousLayer.Id };

      // set material
      if (
@@ -4,7 +4,7 @@ using Speckle.Converters.Common;
 using Speckle.Converters.Rhino;
 using Speckle.Objects.Other;
 using Speckle.Sdk;
-using Speckle.Sdk.Common.Exceptions;
+using Speckle.Sdk.Common;
 using Material = Rhino.DocObjects.Material;

 namespace Speckle.Connectors.Rhino.HostApp;
@@ -3,7 +3,6 @@ using Rhino.DocObjects;
 using Rhino.Geometry;
 using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Common.Operations.Receive;
 using Speckle.Connectors.Rhino.HostApp;
 using Speckle.Converters.Common;
@@ -54,11 +53,11 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
    _activityFactory = activityFactory;
  }

-  public async Task<HostObjectBuilderResult> Build(
+  public Task<HostObjectBuilderResult> Build(
    Base rootObject,
    string projectName,
    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed,
    CancellationToken cancellationToken
  )
  {
@@ -90,7 +89,7 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
    }

    // 3 - Bake materials and colors, as they are used later down the line by layers and objects
-    onOperationProgressed.Report(new("Converting materials and colors", null));
+    onOperationProgressed?.Invoke("Converting materials and colors", null);
    if (unpackedRoot.RenderMaterialProxies != null)
    {
      using var _ = _activityFactory.Start("Render Materials");
@@ -104,7 +103,7 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder

    // 4 - Bake layers
    // See [CNX-325: Rhino: Change receive operation order to increase performance](https://linear.app/speckle/issue/CNX-325/rhino-change-receive-operation-order-to-increase-performance)
-    onOperationProgressed.Report(new("Baking layers (redraw disabled)", null));
+    onOperationProgressed?.Invoke("Baking layers (redraw disabled)", null);
    using (var _ = _activityFactory.Start("Pre baking layers"))
    {
      using var layerNoDraw = new DisableRedrawScope(_converterSettings.Current.Document.Views);
@@ -126,7 +125,7 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
      {
        using (var convertActivity = _activityFactory.Start("Converting object"))
        {
-          onOperationProgressed.Report(new("Converting objects", (double)++count / atomicObjects.Count));
+          onOperationProgressed?.Invoke("Converting objects", (double)++count / atomicObjects.Count);
          try
          {
            // 1: get pre-created layer from cache in layer baker
@@ -142,19 +141,7 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
              var guid = BakeObject(geometryBase, obj, layerIndex);
              conversionIds.Add(guid.ToString());
            }
-            else if (result is List<GeometryBase> geometryBases) // one to many raw encoding case
-            {
-              // NOTE: I'm unhappy about this case (dim). It's needed as the raw encoder approach can hypothetically return
-              // multiple "geometry bases" - but this is not a fallback conversion.
-              // EXTRA NOTE: Oguzhan says i shouldn't be unhappy about this - it's a legitimate case
-              // EXTRA EXTRA NOTE: TY Ogu, i am no longer than unhappy about it. It's legit "mess".
-              foreach (var gb in geometryBases)
-              {
-                var guid = BakeObject(gb, obj, layerIndex);
-                conversionIds.Add(guid.ToString());
-              }
-            }
-            else if (result is IEnumerable<(object, Base)> fallbackConversionResult) // one to many fallback conversion
+            else if (result is IEnumerable<(object, Base)> fallbackConversionResult)
            {
              var guids = BakeObjectsAsGroup(fallbackConversionResult, obj, layerIndex, baseLayerName);
              conversionIds.AddRange(guids.Select(id => id.ToString()));
@@ -162,7 +149,7 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder

            if (conversionIds.Count == 0)
            {
-              throw new SpeckleException($"Failed to convert object.");
+              throw new SpeckleConversionException($"Failed to convert object.");
            }

            // 4: log
@@ -196,9 +183,12 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
    // 6 - Convert instances
    using (var _ = _activityFactory.Start("Converting instances"))
    {
-      var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = await _instanceBaker
-        .BakeInstances(instanceComponentsWithPath, applicationIdMap, baseLayerName, onOperationProgressed)
-        .ConfigureAwait(false);
+      var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = _instanceBaker.BakeInstances(
+        instanceComponentsWithPath,
+        applicationIdMap,
+        baseLayerName,
+        onOperationProgressed
+      );

      bakedObjectIds.RemoveAll(id => consumedObjectIds.Contains(id)); // remove all objects that have been "consumed"
      bakedObjectIds.AddRange(createdInstanceIds); // add instance ids
@@ -214,7 +204,7 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder

    _converterSettings.Current.Document.Views.Redraw();

-    return new HostObjectBuilderResult(bakedObjectIds, conversionResults);
+    return Task.FromResult(new HostObjectBuilderResult(bakedObjectIds, conversionResults));
  }

  private void PreReceiveDeepClean(string baseLayerName)
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using Rhino.Display;
 using Rhino.DocObjects;
 using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.Common.Caching;
@@ -60,11 +61,18 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
    _activityFactory = activityFactory;
  }

-  public async Task<RootObjectBuilderResult> Build(
+  public Task<RootObjectBuilderResult> Build(
    IReadOnlyList<RhinoObject> rhinoObjects,
    SendInfo sendInfo,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed = null,
    CancellationToken cancellationToken = default
+  ) => Task.FromResult(BuildSync(rhinoObjects, sendInfo, onOperationProgressed, cancellationToken));
+
+  private RootObjectBuilderResult BuildSync(
+    IReadOnlyList<RhinoObject> rhinoObjects,
+    SendInfo sendInfo,
+    Action<string, double?>? onOperationProgressed,
+    CancellationToken cancellationToken
  )
  {
    using var activity = _activityFactory.Start("Build");
@@ -72,6 +80,10 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
    Collection rootObjectCollection = new() { name = _converterSettings.Current.Document.Name ?? "Unnamed document" };
    rootObjectCollection["units"] = _converterSettings.Current.SpeckleUnits;

+
+    // MULTIPLAYER!
+    AddCommitView(rootObjectCollection);
+
    // 1 - Unpack the instances
    UnpackResult<RhinoObject> unpackResults;
    using (var _ = _activityFactory.Start("UnpackSelection"))
@@ -107,7 +119,7 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
        results.Add(result);

        ++count;
-        onOperationProgressed.Report(new("Converting", (double)count / atomicObjects.Count));
+        onOperationProgressed?.Invoke("Converting", (double)count / atomicObjects.Count);

        // NOTE: useful for testing ui states, pls keep for now so we can easily uncomment
        // Thread.Sleep(550);
@@ -116,24 +128,38 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>

    if (results.All(x => x.Status == Status.ERROR))
    {
-      throw new SpeckleException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
+      throw new SpeckleConversionException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
    }

    using (var _ = _activityFactory.Start("UnpackRenderMaterials"))
    {
      // 4 - Unpack the render material proxies
      rootObjectCollection[ProxyKeys.RENDER_MATERIAL] = _materialUnpacker.UnpackRenderMaterial(atomicObjects);
-    }
-    using (var _ = _activityFactory.Start("UnpackColors"))
-    {
+
      // 5 - Unpack the color proxies
      rootObjectCollection[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, versionLayers.ToList());
    }

-    await Task.Yield();
    return new RootObjectBuilderResult(rootObjectCollection, results);
  }

+  private void AddCommitView(Collection rootObjectCollection)
+  {
+    // convert current rhino viewport view to Speckle View3D object
+    // retrieve current active viewport
+    RhinoView activeView = _converterSettings.Current.Document.Views.ActiveView;
+    RhinoViewport viewport = activeView.ActiveViewport;
+
+    // attach to rootObjectCollection under "view" property
+    Base currentView = new();
+
+    // attach all important viewport props
+    currentView["CameraLocation"] = viewport.CameraLocation;
+    currentView["up"] = viewport.CameraUp;
+    currentView["forward"] = viewport.CameraDirection;
+    rootObjectCollection["view"] = currentView;
+  }
+
  private SendConversionResult ConvertRhinoObject(
    RhinoObject rhinoObject,
    Collection collectionHost,
@@ -0,0 +1,12 @@
+using Speckle.Connectors.DUI.Settings;
+
+namespace Speckle.Connectors.Rhino.Operations.Send.Settings;
+
+public class EnableLiveSession(bool value) : ICardSetting
+{
+  public string? Id { get; set; } = "enableLiveSession";
+  public string? Title { get; set; } = "Enable Live Session";
+  public string? Type { get; set; } = "boolean";
+  public List<string>? Enum { get; set; }
+  public object? Value { get; set; } = value;
+}
@@ -1,5 +1,5 @@
 using Rhino;
-using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.Rhino.HostApp;
 using Speckle.Connectors.Rhino.Plugin;
 using Speckle.InterfaceGenerator;

@@ -8,9 +8,9 @@ namespace Speckle.Connectors.Rhino.DependencyInjection;
 [GenerateAutoInterface]
 public class RhinoPlugin : IRhinoPlugin
 {
-  private readonly IAppIdleManager _idleManager;
+  private readonly IRhinoIdleManager _idleManager;

-  public RhinoPlugin(IAppIdleManager idleManager)
+  public RhinoPlugin(IRhinoIdleManager idleManager)
  {
    _idleManager = idleManager;
  }
@@ -50,7 +50,7 @@ public class SpeckleConnectorsRhinoPlugin : PlugIn
      services.AddRhino();
      services.AddRhinoConverters();

-      // but the Rhino connector has `.rhp` as it is extension.
+      // but the Rhino connector has `.rhp` as it's extension.
      Container = services.BuildServiceProvider();
      Container.UseDUI();

@@ -10,7 +10,6 @@ using Speckle.Connectors.Common.Instances;
 using Speckle.Connectors.Common.Operations;
 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;
@@ -42,7 +41,7 @@ public static class ServiceRegistration
    // Register other connector specific types
    serviceCollection.AddSingleton<IRhinoPlugin, RhinoPlugin>();
    serviceCollection.AddSingleton<DocumentModelStore, RhinoDocumentStore>();
-    serviceCollection.AddSingleton<IAppIdleManager, RhinoIdleManager>();
+    serviceCollection.AddSingleton<IRhinoIdleManager, RhinoIdleManager>();

    // Register bindings
    serviceCollection.AddSingleton<IBinding, TestBinding>();
@@ -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)Operations\Send\Settings\EnableLiveSession.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Registration\ServiceRegistration.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Extensions\BoundingBox.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Extensions\SpeckleApplicationIdExtensions.cs" />
@@ -40,9 +40,9 @@ public class TeklaBasicConnectorBinding : IBasicConnectorBinding

  public void RemoveModel(ModelCard model) => throw new NotImplementedException();

-  public Task HighlightModel(string modelCardId) => throw new NotImplementedException();
+  public void HighlightModel(string modelCardId) => throw new NotImplementedException();

-  public Task HighlightObjects(IReadOnlyList<string> objectIds) => throw new NotImplementedException();
+  public void HighlightObjects(List<string> objectIds) => throw new NotImplementedException();

  public BasicConnectorBindingCommands Commands { get; }
 }
@@ -399,8 +399,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.164, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -408,7 +408,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -457,18 +457,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.164"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.164, )",
-        "resolved": "3.1.0-dev.164",
-        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -1,7 +1,7 @@
 using ArcGIS.Core.Geometry;
 using Speckle.Converters.Common;
+using Speckle.Sdk;
 using Speckle.Sdk.Common;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Converters.ArcGIS3;

@@ -41,6 +41,7 @@ public class ArcGISToSpeckleUnitConverter : IHostToSpeckleUnitConverter<Unit>
      return value;
    }

-    throw new UnitNotSupportedException($"The Unit System \"{hostUnit}\" is unsupported.");
+    // POC: probably would prefer something more specific
+    throw new SpeckleException($"The Unit System \"{hostUnit}\" is unsupported.");
  }
 }
@@ -1,6 +1,5 @@
 using Speckle.Converters.Common.Objects;
 using Speckle.Objects;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

@@ -35,7 +34,7 @@ public class CurveToHostConverter : ITypedConverter<ICurve, ACG.Polyline>
  /// </summary>
  /// <param name="target">The ICurve object to convert.</param>
  /// <returns>The converted RG.Curve object.</returns>
-  /// <exception cref="ValidationException">Thrown when the conversion is not supported for the given type of curve.</exception>
+  /// <exception cref="NotSupportedException">Thrown when the conversion is not supported for the given type of curve.</exception>
  /// <remarks>⚠️ This conversion does NOT perform scaling.</remarks>
  public ACG.Polyline Convert(ICurve target) =>
    target switch
@@ -48,6 +47,6 @@ public class CurveToHostConverter : ITypedConverter<ICurve, ACG.Polyline>
      SOG.Polyline polyline => _polylineConverter.Convert(polyline),
      SOG.Curve curve => _polylineConverter.Convert(curve.displayValue),
      SOG.Polycurve polyCurve => _polyCurveConverter.Convert(polyCurve),
-      _ => throw new ValidationException($"Converter does not support curves of type '{target.GetType().Name}'")
+      _ => throw new NotSupportedException($"Unable to convert curves of type {target.GetType().Name}")
    };
 }
@@ -1,5 +1,5 @@
+using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
-using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;

 namespace Speckle.Converters.ArcGIS3.ToHost.Raw;
@@ -29,19 +29,32 @@ public class GeometryToHostConverter : ITypedConverter<IReadOnlyList<Base>, ACG.

  public ACG.Geometry Convert(IReadOnlyList<Base> target)
  {
-    if (target.Count == 0)
+    try
    {
-      throw new ValidationException("Feature contains no geometry");
+      if (target.Count > 0)
+      {
+        switch (target[0])
+        {
+          case SOG.Point point:
+            return _multipointConverter.Convert(target.Cast<SOG.Point>().ToList());
+          case SOG.Polyline polyline:
+            return _polylineConverter.Convert(target.Cast<SOG.Polyline>().ToList());
+          case SGIS.PolygonGeometry3d geometry3d:
+            return _polygon3dConverter.Convert(target.Cast<SGIS.PolygonGeometry3d>().ToList());
+          case SGIS.PolygonGeometry geometry:
+            return _polygonConverter.Convert(target.Cast<SGIS.PolygonGeometry>().ToList());
+          case SGIS.GisMultipatchGeometry mesh:
+            return _multipatchConverter.Convert(target.Cast<SGIS.GisMultipatchGeometry>().ToList());
+          default:
+            throw new NotSupportedException($"No conversion found for type {target[0]}");
+        }
+      }
+      throw new NotSupportedException($"Feature contains no geometry");
    }
-
-    return target[0] switch
+    catch (SpeckleConversionException e)
    {
-      SOG.Point => _multipointConverter.Convert(target.Cast<SOG.Point>().ToList()),
-      SOG.Polyline => _polylineConverter.Convert(target.Cast<SOG.Polyline>().ToList()),
-      SGIS.PolygonGeometry3d => _polygon3dConverter.Convert(target.Cast<SGIS.PolygonGeometry3d>().ToList()),
-      SGIS.PolygonGeometry => _polygonConverter.Convert(target.Cast<SGIS.PolygonGeometry>().ToList()),
-      SGIS.GisMultipatchGeometry => _multipatchConverter.Convert(target.Cast<SGIS.GisMultipatchGeometry>().ToList()),
-      _ => throw new ValidationException($"No conversion found for type {target[0]}")
-    };
+      Console.WriteLine(e);
+      throw; // log errors
+    }
  }
 }
@@ -1,7 +1,6 @@
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
 using Speckle.Objects.Utils;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

@@ -23,7 +22,7 @@ public class MeshListToHostConverter : ITypedConverter<List<SOG.Mesh>, ACG.Multi
  {
    if (target.Count == 0)
    {
-      throw new ValidationException("Feature contains no geometries");
+      throw new SpeckleConversionException("Feature contains no geometries");
    }
    ACG.MultipatchBuilderEx multipatchPart = new(_settingsStore.Current.ActiveCRSoffsetRotation.SpatialReference);

@@ -1,5 +1,5 @@
+using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

@@ -16,7 +16,7 @@ public class MultipatchListToHostConverter : ITypedConverter<List<SGIS.GisMultip
  {
    if (target.Count == 0)
    {
-      throw new ValidationException("Feature contains no geometries");
+      throw new SpeckleConversionException("Feature contains no geometries");
    }
    ACG.MultipatchBuilderEx multipatchPart = new();
    foreach (SGIS.GisMultipatchGeometry part in target)
@@ -1,5 +1,5 @@
+using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

@@ -16,7 +16,7 @@ public class PointListToHostConverter : ITypedConverter<List<SOG.Point>, ACG.Mul
  {
    if (target.Count == 0)
    {
-      throw new ValidationException("Feature contains no geometries");
+      throw new SpeckleConversionException("Feature contains no geometries");
    }
    List<ACG.MapPoint> pointList = new();
    foreach (SOG.Point pt in target)
@@ -1,5 +1,5 @@
+using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

@@ -21,7 +21,7 @@ public class Polygon3dListToHostConverter : ITypedConverter<List<SGIS.PolygonGeo
  {
    if (target.Count == 0)
    {
-      throw new ValidationException("Feature contains no geometries");
+      throw new SpeckleConversionException("Feature contains no geometries");
    }

    ACG.MultipatchBuilderEx multipatchPart = new();
@@ -1,5 +1,5 @@
+using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

@@ -16,7 +16,7 @@ public class PolygonListToHostConverter : ITypedConverter<List<SGIS.PolygonGeome
  {
    if (target.Count == 0)
    {
-      throw new ValidationException("Feature contains no geometries");
+      throw new SpeckleConversionException("Feature contains no geometries");
    }
    List<ACG.Polygon> polyList = new();
    foreach (SGIS.PolygonGeometry poly in target)
@@ -1,5 +1,5 @@
+using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
-using Speckle.Sdk.Common.Exceptions;

 namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

@@ -16,7 +16,7 @@ public class PolylineListToHostConverter : ITypedConverter<List<SOG.Polyline>, A
  {
    if (target.Count == 0)
    {
-      throw new ValidationException("Feature contains no geometries");
+      throw new SpeckleConversionException("Feature contains no geometries");
    }
    List<ACG.Polyline> polyList = new();
    foreach (SOG.Polyline poly in target)
@@ -1,6 +1,5 @@
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
-using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;

 namespace Speckle.Converters.ArcGIS3.ToHost.TopLevel;
@@ -29,7 +28,7 @@ public class FallbackToHostConverter : IToHostTopLevelConverter, ITypedConverter
  {
    if (!target.displayValue.Any())
    {
-      throw new ValidationException($"Zero fallback values specified");
+      throw new NotSupportedException($"Zero fallback values specified");
    }

    var first = target.displayValue[0];
@@ -39,7 +38,7 @@ public class FallbackToHostConverter : IToHostTopLevelConverter, ITypedConverter
      SOG.Polyline => _polylineListConverter.Convert(target.displayValue.Cast<SOG.Polyline>().ToList()),
      SOG.Mesh => _meshListConverter.Convert(target.displayValue.Cast<SOG.Mesh>().ToList()),
      SOG.Point => _pointListConverter.Convert(target.displayValue.Cast<SOG.Point>().ToList()),
-      _ => throw new ValidationException($"Found unsupported fallback geometry: {first.GetType()}")
+      _ => throw new NotSupportedException($"Found unsupported fallback geometry: {first.GetType()}")
    };
  }
 }
@@ -1,7 +1,6 @@
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
 using Speckle.Objects;
-using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;

 namespace Speckle.Converters.ArcGIS3.ToHost.TopLevel;
@@ -9,6 +8,8 @@ namespace Speckle.Converters.ArcGIS3.ToHost.TopLevel;
 /// <summary>
 /// Converter for <see cref="IGisFeature"/> with geometry.
 /// </summary>
+/// <exception cref="ArgumentException"> Thrown when IGisFeature is <see cref="SGIS.GisNonGeometricFeature"/> because it has no geometry, or when Multipatch geometry contained invalid types.</exception>
+/// <exception cref="NotSupportedException">Thrown for unsupported <see cref="IGisFeature"/> classes.</exception>
 [NameAndRankValue(nameof(SGIS.GisMultipatchFeature), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK)]
 public class GisMultipatchFeatureToHostConverter
  : IToHostTopLevelConverter,
@@ -47,9 +48,8 @@ public class GisMultipatchFeatureToHostConverter

    if (multipatch is null)
    {
-      throw new ConversionException("Multipatch conversion did not return valid geometry");
+      throw new SpeckleConversionException("Multipatch conversion did not return valid geometry");
    }
-
    return multipatch;
  }
 }
@@ -1,6 +1,5 @@
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
-using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;

 namespace Speckle.Converters.ArcGIS3.ToHost.TopLevel;
@@ -42,7 +41,7 @@ public class PolycurveToHostConverter : IToHostTopLevelConverter, ITypedConverte
        )
      )
      {
-        throw new ValidationException("Polycurve segments are not in a correct sequence/orientation");
+        throw new SpeckleConversionException("Polycurve segments are not in a correct sequence/orientation");
      }

      lastConvertedPt = segmentPts[^1];
@@ -3,7 +3,6 @@ using Speckle.Converters.ArcGIS3.Utils;
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
 using Speckle.Objects;
-using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;

 namespace Speckle.Converters.ArcGIS3.ToSpeckle.Raw;
@@ -191,7 +190,7 @@ public class GisFeatureToSpeckleConverter : ITypedConverter<(Row, string), IGisF
        };

      default:
-        throw new ValidationException($"No geometry conversion found for {shape.GetType().Name}");
+        throw new NotSupportedException($"No geometry conversion found for {shape.GetType().Name}");
    }
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dogukan Karatas	6aed475a4d	call the function	2024-10-03 13:33:38 +02:00
Dogukan Karatas	6b0819ecca	AddCommitView added	2024-10-03 12:58:36 +02:00
oguzhankoral	20020b6fa0	URL for hackathon UI	2024-10-03 13:19:48 +03:00
oguzhankoral	a798baea4e	wip	2024-10-03 12:27:27 +03:00