URL for hackathon UI

wip
2024-10-03 13:19:48 +03:00 · 2024-10-03 12:27:27 +03:00
666 changed files with 9585 additions and 31842 deletions
@@ -255,6 +255,8 @@ dotnet_diagnostic.ca1509.severity = warning # Invalid entry in code metrics conf
 dotnet_diagnostic.ca1861.severity = none # Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1861)

 dotnet_diagnostic.cs8618.severity = suggestion # nullable problem
+dotnet_diagnostic.CS0809.severity = suggestion # obsolete errors
+dotnet_diagnostic.CS0618.severity = suggestion # obsolete errors


 # Performance rules
@@ -19,7 +19,7 @@ jobs:
      - name: Setup .NET
        uses: actions/setup-dotnet@v4
        with:
-          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
+          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)
      
      - name: Cache Nuget     
        uses: actions/cache@v4
@@ -38,7 +38,7 @@ jobs:
      - name: Setup .NET
        uses: actions/setup-dotnet@v4
        with:
-          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
+          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)
      
      - name: Cache Nuget     
        uses: actions/cache@v4
@@ -50,7 +50,7 @@ jobs:
        run: ./build.sh test-only
        
      - name: Upload coverage reports to Codecov with GitHub Action
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
        with:
          file: Converters/**/coverage.xml
          token: ${{ secrets.CODECOV_TOKEN }}
@@ -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:
@@ -19,7 +19,7 @@ jobs:
      - name: Setup .NET
        uses: actions/setup-dotnet@v4
        with:
-          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
+          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)

      - name: Cache Nuget
        uses: actions/cache@v4
@@ -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
@@ -79,7 +78,7 @@ jobs:
      - name: Setup .NET
        uses: actions/setup-dotnet@v4
        with:
-          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
+          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)

      - name: Cache Nuget
        uses: actions/cache@v4
@@ -91,7 +90,7 @@ jobs:
        run: ./build.sh test-only

      - name: Upload coverage reports to Codecov with GitHub Action
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
        with:
          file: Converters/**/coverage.xml
          token: ${{ secrets.CODECOV_TOKEN }}
@@ -19,5 +19,4 @@ tools
 .DS_Store
 *.snupkg
 coverage.xml
-output/
-Images/Thumbs.db
+output/
@@ -31,33 +31,6 @@ public static class Consts
        new("Connectors/Autocad/Speckle.Connectors.Autocad2024", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Autocad2025", "net8.0-windows")
      ]
-    ),
-    new(
-      "civil3d",
-      [
-        new("Connectors/Autocad/Speckle.Connectors.Civil3d2022", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Civil3d2023", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Civil3d2024", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Civil3d2025", "net8.0-windows")
-      ]
-    ),
-    new(
-      "navisworks",
-      [
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2020", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2021", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2022", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2023", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2024", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2025", "net48")
-      ]
-    ),
-    new(
-      "tekla-structures",
-      [
-        new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
-        new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48")
-      ]
    )
  };
 }
@@ -150,10 +150,7 @@ Target(
    var version = Environment.GetEnvironmentVariable("GitVersion_FullSemVer") ?? "3.0.0-localBuild";
    var fileVersion = Environment.GetEnvironmentVariable("GitVersion_AssemblySemFileVer") ?? "3.0.0.0";
    Console.WriteLine($"Version: {version} & {fileVersion}");
-    Run(
-      "dotnet",
-      $"build {s} -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
-    );
+    Run("dotnet", $"build {s} -c Release --no-restore -p:Version={version} -p:FileVersion={fileVersion} -v:m");
  }
 );

@@ -45,7 +45,6 @@ public static class Solutions

    CheckAndRemoveKnown("Speckle.Objects");
    CheckAndRemoveKnown("Speckle.Sdk");
-    CheckAndRemoveKnown("Speckle.Sdk.Dependencies");
    if (localProjects.Count != 0)
    {
      throw new InvalidOperationException(
@@ -16,16 +16,18 @@
      },
      "Microsoft.Build": {
        "type": "Direct",
-        "requested": "[17.11.4, )",
-        "resolved": "17.11.4",
-        "contentHash": "UMC7DfeFEHY2GGHHaghybUuUlLaByFHEFudR2PehMgDBuRuLAUePp1iaa4eFtVzepRzMtIbeSCVJCzzX3NV2Gg==",
+        "requested": "[17.10.4, )",
+        "resolved": "17.10.4",
+        "contentHash": "ZmGA8vhVXFzC4oo48ybQKlEybVKd0Ntfdr+Enqrn5ES1R6e/krIK9hLk0W33xuT0/G6QYd3YdhJZh+Xle717Ag==",
        "dependencies": {
-          "Microsoft.Build.Framework": "17.11.4",
-          "Microsoft.NET.StringTools": "17.11.4",
+          "Microsoft.Build.Framework": "17.10.4",
+          "Microsoft.NET.StringTools": "17.10.4",
          "System.Collections.Immutable": "8.0.0",
          "System.Configuration.ConfigurationManager": "8.0.0",
          "System.Reflection.Metadata": "8.0.0",
-          "System.Reflection.MetadataLoadContext": "8.0.0"
+          "System.Reflection.MetadataLoadContext": "8.0.0",
+          "System.Security.Principal.Windows": "5.0.0",
+          "System.Threading.Tasks.Dataflow": "8.0.0"
        }
      },
      "Microsoft.NETFramework.ReferenceAssemblies": {
@@ -67,8 +69,8 @@
      },
      "Microsoft.Build.Framework": {
        "type": "Transitive",
-        "resolved": "17.11.4",
-        "contentHash": "u28uDihlqxtt8h2dL1ZJOZ7TRkxBK+HGr+3FgQpILVo7Q7gErkw8mYW9R+RM5PtxvZTdYb/4MWDL66vdIsANBQ=="
+        "resolved": "17.10.4",
+        "contentHash": "4qXCwNOXBR1dyCzuks9SwTwFJQO/xmf2wcMislotDWJu7MN/r3xDNoU8Ae5QmKIHPaLG1xmfDkYS7qBVzxmeKw=="
      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
@@ -77,8 +79,8 @@
      },
      "Microsoft.NET.StringTools": {
        "type": "Transitive",
-        "resolved": "17.11.4",
-        "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA=="
+        "resolved": "17.10.4",
+        "contentHash": "wyABaqY+IHCMMSTQmcc3Ca6vbmg5BaEPgicnEgpll+4xyWZWlkQqUwafweUd9VAhBb4jqplMl6voUHQ6yfdUcg=="
      },
      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
        "type": "Transitive",
@@ -130,6 +132,17 @@
        "type": "Transitive",
        "resolved": "8.0.0",
        "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg=="
+      },
+      "System.Security.Principal.Windows": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
+      },
+      "System.Threading.Tasks.Dataflow": {
+        "type": "CentralTransitive",
+        "requested": "[6.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "7V0I8tPa9V7UxMx/+7DIwkhls5ouaEMQx6l/GwGm1Y8kJQ61On9B/PxCXFLbgu5/C47g0BP2CUYs+nMv1+Oaqw=="
      }
    }
  }
@@ -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;

@@ -53,8 +50,17 @@ public class ArcGISSelectionBinding : ISelectionBinding
    selectedMembers.AddRange(mapView.GetSelectedStandaloneTables());

    List<MapMember> allNestedMembers = new();
-    var layerMapMembers = _mapMemberUtils.UnpackMapLayers(selectedMembers);
-    allNestedMembers.AddRange(layerMapMembers);
+    foreach (MapMember member in selectedMembers)
+    {
+      if (member is GroupLayer group)
+      {
+        GetLayersFromGroup(group, allNestedMembers);
+      }
+      else
+      {
+        allNestedMembers.Add(member);
+      }
+    }

    List<string> objectTypes = allNestedMembers
      .Select(o => o.GetType().ToString().Split(".").Last())
@@ -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);
    }
  }

@@ -381,7 +386,7 @@ public sealed class ArcGISSendBinding : ISendBinding
            );
          List<MapMember> mapMembers = modelCard
            .SendFilter.NotNull()
-            .RefreshObjectIds()
+            .GetObjectIds()
            .Select(id => (MapMember)MapView.Active.Map.FindLayer(id) ?? MapView.Active.Map.FindStandaloneTable(id))
            .Where(obj => obj != null)
            .ToList();
@@ -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();
@@ -454,9 +463,9 @@ public sealed class ArcGISSendBinding : ISendBinding

    foreach (SenderModelCard sender in senders)
    {
-      var objIds = sender.SendFilter.NotNull().RefreshObjectIds();
+      var objIds = sender.SendFilter.NotNull().GetObjectIds();
      var intersection = objIds.Intersect(objectIdsList).ToList();
-      bool isExpired = intersection.Count != 0;
+      bool isExpired = sender.SendFilter.NotNull().CheckExpiry(objectIdsList);
      if (isExpired)
      {
        expiredSenderIds.Add(sender.ModelCardId.NotNull());
@@ -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;
@@ -54,16 +53,16 @@ public class BasicConnectorBinding : IBasicConnectorBinding

  public DocumentModelStore GetDocumentState() => _store;

-  public void AddModel(ModelCard model) => _store.AddModel(model);
+  public void AddModel(ModelCard model) => _store.Models.Add(model);

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

  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);

@@ -76,7 +75,7 @@ public class BasicConnectorBinding : IBasicConnectorBinding

    if (model is SenderModelCard senderModelCard)
    {
-      objectIds = senderModelCard.SendFilter.NotNull().RefreshObjectIds().Select(x => new ObjectID(x)).ToList();
+      objectIds = senderModelCard.SendFilter.NotNull().GetObjectIds().Select(x => new ObjectID(x)).ToList();
    }

    if (model is ReceiverModelCard receiverModelCard)
@@ -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)
@@ -12,6 +12,7 @@ using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
+using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converters.Common;
@@ -27,39 +28,41 @@ public static class ArcGISConnectorModule
  public static void AddArcGIS(this IServiceCollection serviceCollection)
  {
    serviceCollection.AddConnectorUtils();
-    serviceCollection.AddDUI<ArcGISDocumentStore>();
+    serviceCollection.AddDUI();
    serviceCollection.AddDUIView();

+    serviceCollection.AddSingleton<DocumentModelStore, ArcGISDocumentStore>();
    // Register bindings
    serviceCollection.AddSingleton<IBinding, TestBinding>();
    serviceCollection.AddSingleton<IBinding, ConfigBinding>();
    serviceCollection.AddSingleton<IBinding, AccountBinding>();
+
+    serviceCollection.RegisterTopLevelExceptionHandler();
+
    serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
    serviceCollection.AddSingleton<IBasicConnectorBinding, BasicConnectorBinding>();

-    serviceCollection.RegisterTopLevelExceptionHandler();
+    serviceCollection.AddSingleton<IBinding, ArcGISSelectionBinding>();
+    serviceCollection.AddSingleton<IBinding, ArcGISSendBinding>();
+    serviceCollection.AddSingleton<IBinding, ArcGISReceiveBinding>();
+
+    serviceCollection.AddTransient<ISendFilter, ArcGISSelectionFilter>();
+    serviceCollection.AddScoped<IHostObjectBuilder, ArcGISHostObjectBuilder>();
    serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());

    // register send operation and dependencies
-    serviceCollection.AddSingleton<IBinding, ArcGISSendBinding>();
    serviceCollection.AddScoped<SendOperation<MapMember>>();
-    serviceCollection.AddSingleton<IBinding, ArcGISSelectionBinding>();
-    serviceCollection.AddTransient<ISendFilter, ArcGISSelectionFilter>();
    serviceCollection.AddScoped<ArcGISRootObjectBuilder>();
    serviceCollection.AddScoped<IRootObjectBuilder<MapMember>, ArcGISRootObjectBuilder>();
-    serviceCollection.AddScoped<ArcGISLayerUnpacker>();
-    serviceCollection.AddScoped<ArcGISColorUnpacker>();
+
+    serviceCollection.AddScoped<LocalToGlobalConverterUtils>();
+
+    serviceCollection.AddScoped<ArcGISColorManager>();
+    serviceCollection.AddScoped<MapMembersUtils>();
+
    // register send conversion cache
    serviceCollection.AddSingleton<ISendConversionCache, SendConversionCache>();

-    // register receive operation and dependencies
-    // serviceCollection.AddSingleton<IBinding, ArcGISReceiveBinding>(); // POC: disabled until receive code is refactored
-    serviceCollection.AddScoped<LocalToGlobalConverterUtils>();
-    serviceCollection.AddScoped<ArcGISColorManager>();
-    serviceCollection.AddScoped<IHostObjectBuilder, ArcGISHostObjectBuilder>();
-
-    serviceCollection.AddScoped<MapMembersUtils>();
-
    // operation progress manager
    serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
  }
@@ -154,6 +154,7 @@
        Log.LogErrorFromException(ex);
        return false;
      }
+      return Success;
    ]]>
      </Code>
    </Task>
@@ -189,7 +190,7 @@
            {
                Log.LogMessage(MessageImportance.Low, "RelativePaths: " + i.ToString());
            }
-            Success = true;
+            return true;
 			 ]]>
      </Code>
    </Task>
@@ -265,6 +266,7 @@
        CleanInfo = AssemblyName + extension;
      }
      Success = true;
+      return Success;
 	]]>
      </Code>
    </Task>
@@ -0,0 +1,10 @@
+using Speckle.Connectors.DUI.Models.Card.SendFilter;
+
+namespace Speckle.Connectors.ArcGIS.Filters;
+
+public class ArcGISEverythingFilter : EverythingSendFilter
+{
+  public override List<string> GetObjectIds() => new(); // TODO
+
+  public override bool CheckExpiry(string[] changedObjectIds) => true;
+}
@@ -4,10 +4,7 @@ namespace Speckle.Connectors.ArcGIS.Filters;

 public class ArcGISSelectionFilter : DirectSelectionSendFilter
 {
-  public ArcGISSelectionFilter()
-  {
-    IsDefault = true;
-  }
+  public override List<string> GetObjectIds() => SelectedObjectIds;

-  public override List<string> RefreshObjectIds() => SelectedObjectIds;
+  public override bool CheckExpiry(string[] changedObjectIds) => SelectedObjectIds.Intersect(changedObjectIds).Any();
 }
@@ -1,3 +0,0 @@
-global using AC = ArcGIS.Core;
-global using ACD = ArcGIS.Core.Data;
-global using ADM = ArcGIS.Desktop.Mapping;
@@ -1,39 +1,68 @@
 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;
 using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Models.Extensions;
 using Speckle.Sdk.Models.GraphTraversal;
 using Speckle.Sdk.Models.Proxies;

 namespace Speckle.Connectors.ArcGIS.HostApp;

-/// <summary>
-/// TODO: definitely need to refactor this, probably will collect colors during layer iteration in the root object builder.
-/// </summary>
 public class ArcGISColorManager
 {
+  private Dictionary<string, ColorProxy> ColorProxies { get; set; } = new();
  public Dictionary<string, Color> ObjectColorsIdMap { get; set; } = new();
  public Dictionary<string, Color> ObjectMaterialsIdMap { get; set; } = new();

+  /// <summary>
+  /// Iterates through a given set of arcGIS map members (layers containing objects) and collects their colors.
+  /// </summary>
+  /// <param name="mapMembersWithDisplayPriority"></param>
+  /// <returns>A list of color proxies, where the application Id is argb value + display priority</returns>
+  /// <remarks>
+  /// In ArcGIS, map members contain a formula, which individual features contained in map members will use to calculate their color.
+  /// Since display priority is important for ArcGIS layers, we are creating different Color Proxies for eg the same argb color value but different display priority.
+  /// </remarks>
+  public List<ColorProxy> UnpackColors(List<(MapMember, int)> mapMembersWithDisplayPriority)
+  {
+    // injected as Singleton, so we need to clean existing proxies first
+    ColorProxies = new();
+
+    foreach ((MapMember mapMember, int priority) in mapMembersWithDisplayPriority)
+    {
+      switch (mapMember)
+      {
+        // FeatureLayer colors will be processed per feature object
+        case FeatureLayer featureLayer:
+          ProcessFeatureLayerColors(featureLayer, priority);
+          break;
+
+        // RasterLayer object colors are converted as mesh vertex colors, but we need to store displayPriority on the raster layer. Default color is used for all rasters.
+        case RasterLayer rasterLayer:
+          ProcessRasterLayerColors(rasterLayer, priority);
+          break;
+      }
+    }
+
+    return ColorProxies.Values.ToList();
+  }
+
  /// <summary>
  /// Parse Color Proxies and stores in ObjectColorsIdMap the relationship between object ids and colors
  /// </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);
@@ -47,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);
@@ -67,14 +92,6 @@ public class ArcGISColorManager
    }
  }

-  public int CIMColorToInt(CIMColor color)
-  {
-    return (255 << 24)
-      | ((int)Math.Round(color.Values[0]) << 16)
-      | ((int)Math.Round(color.Values[1]) << 8)
-      | (int)Math.Round(color.Values[2]);
-  }
-
  /// <summary>
  /// Create a new CIMUniqueValueClass for UniqueRenderer per each object ID
  /// </summary>
@@ -88,7 +105,6 @@ public class ArcGISColorManager
  {
    // declare default white color
    Color color = Color.FromArgb(255, 255, 255, 255);
-    bool colorFound = false;

    // get color moving upwards from the object
    foreach (var parent in tc.GetAscendants())
@@ -98,43 +114,16 @@ public class ArcGISColorManager
        if (ObjectMaterialsIdMap.TryGetValue(appId, out Color objColorMaterial))
        {
          color = objColorMaterial;
-          colorFound = true;
          break;
        }
        if (ObjectColorsIdMap.TryGetValue(appId, out Color objColor))
        {
          color = objColor;
-          colorFound = true;
          break;
        }
      }
    }

-    // handling Revit case, where child objects have separate colors/materials
-    if (!colorFound && tc.Current is IDataObject)
-    {
-      var displayable = tc.Current.TryGetDisplayValue();
-      if (displayable != null)
-      {
-        foreach (var childObj in displayable)
-        {
-          if (childObj.applicationId is string appId)
-          {
-            if (ObjectMaterialsIdMap.TryGetValue(appId, out Color objColorMaterial))
-            {
-              color = objColorMaterial;
-              break;
-            }
-            if (ObjectColorsIdMap.TryGetValue(appId, out Color objColor))
-            {
-              color = objColor;
-              break;
-            }
-          }
-        }
-      }
-    }
-
    CIMSymbolReference symbol = CreateSymbol(speckleGeometryType, color);

    // First create a "CIMUniqueValueClass"
@@ -201,7 +190,7 @@ public class ArcGISColorManager
    }

    // declare default grey color, create default symbol for the given layer geometry type
-    var color = Color.FromArgb(CIMColorToInt(ColorFactory.Instance.GreyRGB));
+    var color = Color.FromArgb(ColorFactory.Instance.GreyRGB.CIMColorToInt());
    CIMSymbolReference defaultSymbol = CreateSymbol(fLayer.ShapeType, color);

    // get existing renderer classes
@@ -232,10 +221,7 @@ public class ArcGISColorManager
    foreach (var tContext in traversalContexts)
    {
      // get unique label
-      string? uniqueLabel = tContext.Current?.id;
-
-      // remove any GIS-specific classes for now
-      /*
+      string uniqueLabel = tContext.Current.id;
      if (tContext.Current is IGisFeature gisFeat)
      {
        var existingLabel = gisFeat.attributes["Speckle_ID"];
@@ -243,9 +229,9 @@ public class ArcGISColorManager
        {
          uniqueLabel = stringLabel;
        }
-      }*/
+      }

-      if (uniqueLabel is not null && !listUniqueValueClasses.Select(x => x.Label).Contains(uniqueLabel))
+      if (!listUniqueValueClasses.Select(x => x.Label).Contains(uniqueLabel))
      {
        CIMUniqueValueClass newUniqueValueClass = CreateColorCategory(tContext, fLayer.ShapeType, uniqueLabel);
        listUniqueValueClasses.Add(newUniqueValueClass);
@@ -267,4 +253,356 @@ public class ArcGISColorManager
      };
    return uvr;
  }
+
+  private string GetColorApplicationId(int argb, double order) => $"{argb}_{order}";
+
+  // Adds the element id to the color proxy based on colorId if it exists in ColorProxies,
+  // otherwise creates a new Color Proxy with the element id in the objects property
+  private void AddElementIdToColorProxy(string elementAppId, int colorValue, string colorId, int displayPriority)
+  {
+    if (ColorProxies.TryGetValue(colorId, out ColorProxy? colorProxy))
+    {
+      colorProxy.objects.Add(elementAppId);
+    }
+    else
+    {
+      ColorProxy newProxy =
+        new()
+        {
+          value = colorValue,
+          applicationId = colorId,
+          objects = new() { elementAppId },
+          name = colorId
+        };
+
+      newProxy["displayOrder"] = displayPriority; // 0 - top layer (top display priority), 1,2,3.. decreasing priority
+      ColorProxies.Add(colorId, newProxy);
+    }
+  }
+
+  private void ProcessRasterLayerColors(RasterLayer rasterLayer, int displayPriority)
+  {
+    string elementAppId = $"{rasterLayer.URI}_0"; // POC: explain why count = 0 here
+    int argb = -1;
+    string colorId = GetColorApplicationId(argb, displayPriority); // We are using a default color of -1 for all raster layers
+    AddElementIdToColorProxy(elementAppId, argb, colorId, displayPriority);
+  }
+
+  /// <summary>
+  /// Record colors from every feature of the layer into ColorProxies
+  /// </summary>
+  /// <param name="layer"></param>
+  /// <param name="displayPriority"></param>
+  private void ProcessFeatureLayerColors(FeatureLayer layer, int displayPriority)
+  {
+    // first get a list of layer fields
+    // field names are unique, but often their alias is used instead by renderer headings
+    // so we are storing both names and alieas in this dictionary for fast lookup
+    // POC: adding aliases are not optimal, because they do not need to be unique && they can be the same as the name of another field
+    Dictionary<string, FieldDescription> layerFieldDictionary = new();
+    foreach (FieldDescription field in layer.GetFieldDescriptions())
+    {
+      layerFieldDictionary.TryAdd(field.Name, field);
+      layerFieldDictionary.TryAdd(field.Alias, field);
+    }
+
+    CIMRenderer layerRenderer = layer.GetRenderer();
+    int count = 1;
+    using (RowCursor rowCursor = layer.Search())
+    {
+      while (rowCursor.MoveNext())
+      {
+        string elementAppId = $"{layer.URI}_{count}";
+        using (Row row = rowCursor.Current)
+        {
+          // get row color
+          int argb = GetLayerColorByRendererAndRow(layerRenderer, row, layerFieldDictionary);
+          string colorId = GetColorApplicationId(argb, displayPriority);
+          AddElementIdToColorProxy(elementAppId, argb, colorId, displayPriority);
+        }
+
+        count++;
+      }
+    }
+  }
+
+  // Attempts to retrieve the color from a CIMSymbol
+  private bool TryGetSymbolColor(CIMSymbol symbol, out int symbolColor)
+  {
+    symbolColor = -1;
+    if (symbol.GetColor() is CIMColor cimColor)
+    {
+      switch (cimColor)
+      {
+        case CIMRGBColor rgbColor:
+          symbolColor = rgbColor.CIMColorToInt();
+          return true;
+        case CIMHSVColor hsvColor:
+          symbolColor = RgbFromHsv(hsvColor);
+          return true;
+        case CIMCMYKColor cmykColor:
+          symbolColor = RgbFromCmyk(cmykColor);
+          return true;
+        default:
+          return false;
+      }
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  private int RbgToInt(int a, int r, int g, int b)
+  {
+    return (a << 24) | (r << 16) | (g << 8) | b;
+  }
+
+  private int RgbFromCmyk(CIMCMYKColor cmykColor)
+  {
+    float c = cmykColor.C;
+    float m = cmykColor.M;
+    float y = cmykColor.Y;
+    float k = cmykColor.K;
+
+    int r = Convert.ToInt32(255 * (1 - c) * (1 - k));
+    int g = Convert.ToInt32(255 * (1 - m) * (1 - k));
+    int b = Convert.ToInt32(255 * (1 - y) * (1 - k));
+    return RbgToInt(255, r, g, b);
+  }
+
+  private int RgbFromHsv(CIMHSVColor hsvColor)
+  {
+    // Translates HSV color to RGB color
+    // H: 0.0 - 360.0, S: 0.0 - 100.0, V: 0.0 - 100.0
+    // R, G, B: 0.0 - 1.0
+
+    float hue = hsvColor.H;
+    float saturation = hsvColor.S;
+    float value = hsvColor.V;
+
+    float c = (value / 100) * (saturation / 100);
+    float x = c * (1 - Math.Abs(((hue / 60) % 2) - 1));
+    float m = (value / 100) - c;
+
+    float r = 0;
+    float g = 0;
+    float b = 0;
+
+    if (hue >= 0 && hue < 60)
+    {
+      r = c;
+      g = x;
+      b = 0;
+    }
+    else if (hue >= 60 && hue < 120)
+    {
+      r = x;
+      g = c;
+      b = 0;
+    }
+    else if (hue >= 120 && hue < 180)
+    {
+      r = 0;
+      g = c;
+      b = x;
+    }
+    else if (hue >= 180 && hue < 240)
+    {
+      r = 0;
+      g = x;
+      b = c;
+    }
+    else if (hue >= 240 && hue < 300)
+    {
+      r = x;
+      g = 0;
+      b = c;
+    }
+    else if (hue >= 300 && hue < 360)
+    {
+      r = c;
+      g = 0;
+      b = x;
+    }
+
+    r += m;
+    g += m;
+    b += m;
+
+    // convert rgb 0.0-1.0 float to int
+    int red = (int)Math.Round(r * 255);
+    int green = (int)Math.Round(g * 255);
+    int blue = (int)Math.Round(b * 255);
+
+    return RbgToInt(255, red, green, blue);
+  }
+
+  private bool TryGetUniqueRendererColor(
+    CIMUniqueValueRenderer uniqueRenderer,
+    Row row,
+    Dictionary<string, FieldDescription> fields,
+    out int color
+  )
+  {
+    if (!TryGetSymbolColor(uniqueRenderer.DefaultSymbol.Symbol, out color)) // get default color
+    {
+      return false;
+    }
+
+    // note: usually there is only 1 group
+    foreach (CIMUniqueValueGroup group in uniqueRenderer.Groups)
+    {
+      string[] fieldNames = uniqueRenderer.Fields;
+      List<string> usedFields = new();
+      foreach (string fieldName in fieldNames)
+      {
+        if (fields.TryGetValue(fieldName, out FieldDescription? headingField))
+        {
+          usedFields.Add(headingField.Name);
+        }
+      }
+
+      // loop through all values in groups to see if any have met conditions that result in a different color
+      foreach (CIMUniqueValueClass groupClass in group.Classes)
+      {
+        bool groupConditionsMet = true;
+        foreach (CIMUniqueValue value in groupClass.Values)
+        {
+          // all field values have to match the row values
+          for (int i = 0; i < usedFields.Count; i++)
+          {
+            string groupValue = value.FieldValues[i].Replace("<Null>", "");
+            object? rowValue = row[usedFields[i]];
+
+            (string newRowValue, string newGroupValue) = MakeValuesComparable(rowValue, groupValue);
+            if (newGroupValue != newRowValue)
+            {
+              groupConditionsMet = false;
+              break;
+            }
+          }
+        }
+
+        // set the group color to class symbol color if conditions are met
+        if (groupConditionsMet)
+        {
+          if (!TryGetSymbolColor(groupClass.Symbol.Symbol, out color))
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    return true;
+  }
+
+  /// <summary>
+  /// Make comparable the Label string of a UniqueValueRenderer (groupValue), and a Feature Attribute value (rowValue)
+  /// </summary>
+  /// <param name="rowValue"></param>
+  /// <param name="groupValue"></param>
+  private (string, string) MakeValuesComparable(object? rowValue, string groupValue)
+  {
+    string newGroupValue = groupValue;
+    string newRowValue = Convert.ToString(rowValue) ?? "";
+
+    // int, doubles are tricky to compare with strings, trimming both to 5 digits
+    if (rowValue is int or short or long)
+    {
+      newRowValue = newRowValue.Split(".")[0];
+      newGroupValue = newGroupValue.Split(".")[0];
+    }
+    else if (rowValue is double || rowValue is float)
+    {
+      newRowValue = string.Concat(
+        newRowValue.Split(".")[0],
+        ".",
+        newRowValue.Split(".")[^1].AsSpan(0, Math.Min(5, newRowValue.Split(".")[^1].Length))
+      );
+      newGroupValue = string.Concat(
+        newGroupValue.Split(".")[0],
+        ".",
+        newGroupValue.Split(".")[^1].AsSpan(0, Math.Min(5, newGroupValue.Split(".")[^1].Length))
+      );
+    }
+
+    return (newRowValue, newGroupValue);
+  }
+
+  private bool TryGetGraduatedRendererColor(
+    CIMClassBreaksRenderer graduatedRenderer,
+    Row row,
+    Dictionary<string, FieldDescription> fields,
+    out int color
+  )
+  {
+    if (!TryGetSymbolColor(graduatedRenderer.DefaultSymbol.Symbol, out color)) // get default color
+    {
+      return false;
+    }
+
+    string? usedField = null;
+    if (fields.TryGetValue(graduatedRenderer.Field, out FieldDescription? field))
+    {
+      usedField = field.Name;
+    }
+
+    List<CIMClassBreak> reversedBreaks = new(graduatedRenderer.Breaks);
+    reversedBreaks.Reverse();
+    foreach (var rBreak in reversedBreaks)
+    {
+      // keep looping until the last matching condition
+      if (Convert.ToDouble(row[usedField]) <= rBreak.UpperBound)
+      {
+        if (!TryGetSymbolColor(rBreak.Symbol.Symbol, out color)) // get default color
+        {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  }
+
+  // Tries to retrieve the feature layer color by renderer and row, or a default color of -1
+  private int GetLayerColorByRendererAndRow(CIMRenderer renderer, Row row, Dictionary<string, FieldDescription> fields)
+  {
+    // default color to white. this will be used if the renderer is not supported.
+    int color = -1;
+
+    // get color depending on renderer type
+    switch (renderer)
+    {
+      case CIMSimpleRenderer simpleRenderer:
+        if (!TryGetSymbolColor(simpleRenderer.Symbol.Symbol, out color))
+        {
+          // POC: report CONVERTED WITH WARNING when implemented
+        }
+        break;
+
+      // unique renderers have groups of conditions that may affect the color of a feature
+      // resulting in a different color than the default renderer symbol color
+      case CIMUniqueValueRenderer uniqueRenderer:
+        if (!TryGetUniqueRendererColor(uniqueRenderer, row, fields, out color)) // get default color
+        {
+          // POC: report CONVERTED WITH WARNING when implemented
+        }
+        break;
+
+      case CIMClassBreaksRenderer graduatedRenderer:
+        if (!TryGetGraduatedRendererColor(graduatedRenderer, row, fields, out color)) // get default color
+        {
+          // POC: report CONVERTED WITH WARNING when implemented
+        }
+        break;
+
+      default:
+        // POC: report CONVERTED WITH WARNING when implemented, unsupported renderer e.g. CIMProportionalRenderer
+        break;
+    }
+
+    return color;
+  }
 }
@@ -1,460 +0,0 @@
-using ArcGIS.Desktop.Mapping;
-using Speckle.Sdk.Models.Proxies;
-
-namespace Speckle.Connectors.ArcGIS.HostApp;
-
-public class ArcGISColorUnpacker
-{
-  /// <summary>
-  /// Cache of all color proxies for converted features. Key is the Color proxy argb value.
-  /// </summary>
-  public Dictionary<int, ColorProxy> ColorProxyCache { get; } = new();
-
-  /// <summary>
-  /// Stores the current renderer (determined by mapMember)
-  /// </summary>
-  private AC.CIM.CIMRenderer? StoredRenderer { get; set; }
-
-  /// <summary>
-  /// Stores the current renderer (determined by tin mapmember)
-  /// </summary>
-  private AC.CIM.CIMTinRenderer? StoredTinRenderer { get; set; }
-
-  /// <summary>
-  /// Stores the used renderer fields from the layer
-  /// </summary>
-  private List<string> StoredRendererFields { get; set; }
-
-  /// <summary>
-  /// Stores an already processed color for current mapMember, to dbe used by all mapMember objects. Only applies to simple type renderers
-  /// </summary>
-  private int? StoredColor { get; set; }
-
-  /// <summary>
-  /// Stores a feature layer renderer to be used by <see cref="ProcessFeatureLayerColor"/> in <see cref="StoredRenderer"/>, any fields used by the renderer from the layer, and resets the <see cref="StoredColor"/> and <see cref="StoredRendererFields"/>
-  /// </summary>
-  /// <param name="featureLayer"></param>
-  /// <exception cref="AC.CalledOnWrongThreadException">Must be called on MCT.</exception>
-  public void StoreRendererAndFields(ADM.FeatureLayer featureLayer)
-  {
-    // field names are unique, but often their alias is used instead by renderer headings
-    // so we are storing both names and alias in this dictionary for fast lookup
-    // POC: adding aliases are not optimal, because they do not need to be unique && they can be the same as the name of another field
-    Dictionary<string, string> layerFieldDictionary = new();
-    foreach (ADM.FieldDescription field in featureLayer.GetFieldDescriptions())
-    {
-      layerFieldDictionary.TryAdd(field.Name, field.Name);
-      layerFieldDictionary.TryAdd(field.Alias, field.Name);
-    }
-
-    // clear stored values
-    StoredRendererFields = new();
-    StoredColor = null;
-    StoredRenderer = null;
-
-    AC.CIM.CIMRenderer layerRenderer = featureLayer.GetRenderer();
-    List<string> fields = new();
-    bool isSupported = false;
-    switch (layerRenderer)
-    {
-      case AC.CIM.CIMSimpleRenderer:
-        isSupported = true;
-        break;
-      case AC.CIM.CIMUniqueValueRenderer uniqueValueRenderer:
-        isSupported = true;
-        fields = uniqueValueRenderer.Fields.ToList();
-        break;
-      case AC.CIM.CIMClassBreaksRenderer classBreaksRenderer:
-        isSupported = true;
-        fields.Add(classBreaksRenderer.Field);
-        break;
-      default:
-        // TODO: log error here that a renderer is unsupported
-        break;
-    }
-
-    if (isSupported)
-    {
-      StoredRenderer = layerRenderer;
-      foreach (string field in fields)
-      {
-        if (layerFieldDictionary.TryGetValue(field, out string? fieldName))
-        {
-          StoredRendererFields.Add(fieldName);
-        }
-      }
-    }
-  }
-
-  /// <summary>
-  /// Stores a las layer renderer to be used by <see cref="ProcessLasLayerColor"/> in <see cref="StoredTinRenderer"/>
-  /// </summary>
-  /// <param name="lasLayer"></param>
-  /// <exception cref="AC.CalledOnWrongThreadException">Must be called on MCT.</exception>
-  public void StoreRenderer(ADM.LasDatasetLayer lasLayer)
-  {
-    // clear stored values
-    StoredTinRenderer = null;
-
-    // POC: not sure why we are only using the first renderer here
-    AC.CIM.CIMTinRenderer layerRenderer = lasLayer.GetRenderers()[0];
-    bool isSupported = false;
-    switch (layerRenderer)
-    {
-      case AC.CIM.CIMTinUniqueValueRenderer:
-        isSupported = true;
-        break;
-      default:
-        // TODO: log error here that a renderer is unsupported
-        break;
-    }
-
-    if (isSupported)
-    {
-      StoredTinRenderer = layerRenderer;
-    }
-  }
-
-  /// <summary>
-  /// Processes a las layer's point color by the stored <see cref="StoredRenderer"/>, and stores the point's id and color proxy to the <see cref="ColorProxyCache"/>.
-  /// POC: logic probably can be combined with ProcessFeatureLayerColor.
-  /// </summary>
-  /// <param name="point"></param>
-  public void ProcessLasLayerColor(ACD.Analyst3D.LasPoint point, string pointApplicationId)
-  {
-    // get the color from the renderer and point
-    AC.CIM.CIMColor? color;
-    switch (StoredTinRenderer)
-    {
-      case AC.CIM.CIMTinUniqueValueRenderer uniqueValueRenderer:
-        color = GetPointColorByUniqueValueRenderer(uniqueValueRenderer, point);
-        break;
-
-      default:
-        return;
-    }
-
-    // get or create the color proxy for the point
-    int argb = CIMColorToInt(color ?? point.RGBColor);
-    AddObjectIdToColorProxyCache(pointApplicationId, argb);
-  }
-
-  // Retrieves the las point color from a unique value renderer
-  // unique renderers have groups of conditions that may affect the color of a feature
-  // resulting in a different color than the default renderer symbol color
-  private AC.CIM.CIMColor? GetPointColorByUniqueValueRenderer(
-    AC.CIM.CIMTinUniqueValueRenderer renderer,
-    ACD.Analyst3D.LasPoint point
-  )
-  {
-    foreach (AC.CIM.CIMUniqueValueGroup group in renderer.Groups)
-    {
-      foreach (AC.CIM.CIMUniqueValueClass groupClass in group.Classes)
-      {
-        foreach (AC.CIM.CIMUniqueValue value in groupClass.Values)
-        {
-          // all field values have to match the row values
-          for (int i = 0; i < value.FieldValues.Length; i++)
-          {
-            string groupValue = value.FieldValues[i].Replace("<Null>", "");
-            object? pointValue = point.ClassCode;
-
-            if (ValuesAreEqual(groupValue, pointValue))
-            {
-              return groupClass.Symbol.Symbol.GetColor();
-            }
-          }
-        }
-      }
-    }
-
-    return null;
-  }
-
-  /// <summary>
-  /// Processes a feature layer's row color by the stored <see cref="StoredRenderer"/>, and stores the row's id and color proxy to the <see cref="ColorProxyCache"/>.
-  /// </summary>
-  /// <param name="row"></param>
-  /// <returns></returns>
-  /// <exception cref="ACD.Exceptions.GeodatabaseException"></exception>
-  public void ProcessFeatureLayerColor(ACD.Row row, string rowApplicationId)
-  {
-    // if stored color is not null, this means the renderer was a simple renderer that applies to the entire layer, and was already created.
-    // just add the row application id to the color proxy.
-    if (StoredColor is int existingColorProxyId)
-    {
-      AddObjectIdToColorProxyCache(rowApplicationId, existingColorProxyId);
-    }
-
-    // get the color from the renderer and row
-    AC.CIM.CIMColor? color = null;
-    switch (StoredRenderer)
-    {
-      // simple renderers do not rely on fields, so the color can be retrieved from the renderer directly
-      case AC.CIM.CIMSimpleRenderer simpleRenderer:
-        color = simpleRenderer.Symbol.Symbol.GetColor();
-        break;
-
-      case AC.CIM.CIMUniqueValueRenderer uniqueValueRenderer:
-        color = GetRowColorByUniqueValueRenderer(uniqueValueRenderer, row);
-        break;
-
-      case AC.CIM.CIMClassBreaksRenderer classBreaksRenderer:
-        color = GetRowColorByClassBreaksRenderer(classBreaksRenderer, row);
-        break;
-    }
-
-    if (color is null)
-    {
-      // TODO: log error or throw exception that color could not be retrieved
-      return;
-    }
-
-    // get or create the color proxy for the row
-    int argb = CIMColorToInt(color);
-    AddObjectIdToColorProxyCache(rowApplicationId, argb);
-
-    // store color if from simple renderer
-    if (StoredRenderer is AC.CIM.CIMSimpleRenderer)
-    {
-      StoredColor = argb;
-    }
-  }
-
-  // Retrieves the row color from a class breaks renderer
-  // unique renderers have groups of conditions that may affect the color of a feature
-  // resulting in a different color than the default renderer symbol color
-  private AC.CIM.CIMColor? GetRowColorByClassBreaksRenderer(AC.CIM.CIMClassBreaksRenderer renderer, ACD.Row row)
-  {
-    AC.CIM.CIMColor? color = null;
-
-    // get the default symbol color
-    if (renderer.DefaultSymbol?.Symbol.GetColor() is AC.CIM.CIMColor defaultColor)
-    {
-      color = defaultColor;
-    }
-
-    // get the first stored field, since this renderer should only have 1 field
-    double storedFieldValue = Convert.ToDouble(row[StoredRendererFields.First()]);
-
-    List<AC.CIM.CIMClassBreak> reversedBreaks = new(renderer.Breaks);
-    reversedBreaks.Reverse();
-    foreach (var rBreak in reversedBreaks)
-    {
-      // keep looping until the last matching condition
-      if (storedFieldValue <= rBreak.UpperBound)
-      {
-        if (rBreak.Symbol.Symbol.GetColor() is AC.CIM.CIMColor breakColor)
-        {
-          color = breakColor;
-        }
-        else
-        {
-          // TODO: log error here, could not retrieve break color from symbol
-        }
-      }
-    }
-
-    return color;
-  }
-
-  // Retrieves the row color from a unique value renderer
-  // unique renderers have groups of conditions that may affect the color of a feature
-  // resulting in a different color than the default renderer symbol color
-  private AC.CIM.CIMColor? GetRowColorByUniqueValueRenderer(AC.CIM.CIMUniqueValueRenderer renderer, ACD.Row row)
-  {
-    AC.CIM.CIMColor? color = null;
-
-    // get the default symbol color
-    if (renderer.DefaultSymbol?.Symbol.GetColor() is AC.CIM.CIMColor defaultColor)
-    {
-      color = defaultColor;
-    }
-
-    // note: usually there is only 1 group
-    foreach (AC.CIM.CIMUniqueValueGroup group in renderer.Groups)
-    {
-      // loop through all values in groups to see if any have met conditions that result in a different color
-      foreach (AC.CIM.CIMUniqueValueClass groupClass in group.Classes)
-      {
-        bool groupConditionsMet = true;
-        foreach (AC.CIM.CIMUniqueValue value in groupClass.Values)
-        {
-          // all field values have to match the row values
-          for (int i = 0; i < StoredRendererFields.Count; i++)
-          {
-            string groupValue = value.FieldValues[i];
-            object? rowValue = row[StoredRendererFields[i]];
-
-            if (!ValuesAreEqual(groupValue, rowValue))
-            {
-              groupConditionsMet = false;
-              break;
-            }
-          }
-        }
-
-        // set the group color to class symbol color if conditions are met
-        if (groupConditionsMet)
-        {
-          if (groupClass.Symbol.Symbol.GetColor() is AC.CIM.CIMColor groupColor)
-          {
-            color = groupColor;
-          }
-          else
-          {
-            // TODO: log error here, could not retrieve group color from symbol
-          }
-        }
-      }
-    }
-
-    return color;
-  }
-
-  /// <summary>
-  /// Compares the label string of a UniqueValueRenderer (groupValue), and an object value (row, las point), to determine if they are equal
-  /// </summary>
-  /// <param name="objectValue"></param>
-  /// <param name="groupValue"></param>
-  private bool ValuesAreEqual(string groupValue, object? objectValue)
-  {
-    switch (objectValue)
-    {
-      case int:
-      case short:
-      case long:
-      case byte:
-        string objectValueString = Convert.ToString(objectValue) ?? "";
-        return groupValue.Equals(objectValueString);
-
-      case string:
-        return groupValue.Equals(objectValue);
-
-      // POC: these are tricky to compare with the label strings accurately, so will trim both values to 5 decimal places.
-      case double d:
-        return double.TryParse(groupValue, out double groupDouble) && groupDouble - d < 0.000001;
-      case float f:
-        return float.TryParse(groupValue, out float groupFloat) && groupFloat - f < 0.000001;
-
-      default:
-        return false;
-    }
-  }
-
-  private void AddObjectIdToColorProxyCache(string objectId, int argb)
-  {
-    if (ColorProxyCache.TryGetValue(argb, out ColorProxy? colorProxy))
-    {
-      colorProxy.objects.Add(objectId);
-    }
-    else
-    {
-      ColorProxy newColorProxy =
-        new()
-        {
-          name = argb.ToString(),
-          objects = new() { objectId },
-          value = argb,
-          applicationId = argb.ToString()
-        };
-
-      ColorProxyCache.Add(argb, newColorProxy);
-    }
-  }
-
-  private int ArgbToInt(int a, int r, int g, int b)
-  {
-    return (a << 24) | (r << 16) | (g << 8) | b;
-  }
-
-  // Gets the argb int from a CIMColor
-  // Defaults to assuming CIMColor.Values represent the red, green, and blue channels.
-  private int CIMColorToInt(AC.CIM.CIMColor color)
-  {
-    switch (color)
-    {
-      case AC.CIM.CIMHSVColor hsv:
-        (float hsvR, float hsvG, float hsvB) = RgbFromHsv(hsv.H, hsv.S, hsv.V);
-        return ArgbToInt(
-          (int)Math.Round(hsv.Alpha),
-          (int)Math.Round(hsvR * 255),
-          (int)Math.Round(hsvG * 255),
-          (int)Math.Round(hsvB * 255)
-        );
-
-      case AC.CIM.CIMCMYKColor cmyk:
-        float k = cmyk.K;
-        int cmykR = Convert.ToInt32(255 * (1 - cmyk.C) * (1 - k));
-        int cmykG = Convert.ToInt32(255 * (1 - cmyk.M) * (1 - k));
-        int cmykB = Convert.ToInt32(255 * (1 - cmyk.Y) * (1 - k));
-        return ArgbToInt((int)Math.Round(cmyk.Alpha), cmykR, cmykG, cmykB);
-
-      default:
-        return ArgbToInt(
-          (int)Math.Round(color.Alpha),
-          (int)Math.Round(color.Values[0]),
-          (int)Math.Round(color.Values[1]),
-          (int)Math.Round(color.Values[2])
-        );
-    }
-  }
-
-  private (float, float, float) RgbFromHsv(float hue, float saturation, float value)
-  {
-    // Translates HSV color to RGB color
-    // H: 0.0 - 360.0, S: 0.0 - 100.0, V: 0.0 - 100.0
-    // R, G, B: 0.0 - 1.0
-
-    float c = (value / 100) * (saturation / 100);
-    float x = c * (1 - Math.Abs(((hue / 60) % 2) - 1));
-    float m = (value / 100) - c;
-
-    float r = 0;
-    float g = 0;
-    float b = 0;
-
-    if (hue >= 0 && hue < 60)
-    {
-      r = c;
-      g = x;
-      b = 0;
-    }
-    else if (hue >= 60 && hue < 120)
-    {
-      r = x;
-      g = c;
-      b = 0;
-    }
-    else if (hue >= 120 && hue < 180)
-    {
-      r = 0;
-      g = c;
-      b = x;
-    }
-    else if (hue >= 180 && hue < 240)
-    {
-      r = 0;
-      g = x;
-      b = c;
-    }
-    else if (hue >= 240 && hue < 300)
-    {
-      r = x;
-      g = 0;
-      b = c;
-    }
-    else if (hue >= 300 && hue < 360)
-    {
-      r = c;
-      g = 0;
-      b = x;
-    }
-
-    r += m;
-    g += m;
-    b += m;
-
-    return (r, g, b);
-  }
-}
@@ -1,97 +0,0 @@
-using Speckle.Connectors.ArcGIS.HostApp.Extensions;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.ArcGIS.HostApp;
-
-public class ArcGISLayerUnpacker
-{
-  /// <summary>
-  /// Cache of all collections created by unpacked Layer MapMembers. Key is the Speckle applicationId (Layer URI).
-  /// </summary>
-  public Dictionary<string, Collection> CollectionCache { get; } = new();
-
-  /// <summary>
-  /// Mapmembers can be layers containing objects, or LayerContainers containing other layers.
-  /// Unpacks selected mapMembers and creates their corresponding collection on the root collection.
-  /// </summary>
-  /// <param name="mapMembers"></param>
-  /// <param name="parentCollection"></param>
-  /// <returns>List of layers containing objects.</returns>
-  /// <exception cref="AC.CalledOnWrongThreadException">Thrown when this method is *not* called on the MCT, because this method accesses mapmember fields</exception>
-  public async Task<List<ADM.MapMember>> UnpackSelectionAsync(
-    IEnumerable<ADM.MapMember> mapMembers,
-    Collection parentCollection,
-    List<ADM.MapMember>? objects = null
-  )
-  {
-    if (objects is null)
-    {
-      objects = new();
-    }
-
-    foreach (ADM.MapMember mapMember in mapMembers)
-    {
-      switch (mapMember)
-      {
-        case ADM.ILayerContainer container:
-          Collection containerCollection = CreateAndCacheMapMemberCollection(mapMember, true);
-          parentCollection.elements.Add(containerCollection);
-
-          await UnpackSelectionAsync(container.Layers, containerCollection, objects).ConfigureAwait(false);
-          break;
-
-        default:
-          if (!(objects.Contains(mapMember)))
-          {
-            Collection collection = CreateAndCacheMapMemberCollection(mapMember);
-            parentCollection.elements.Add(collection);
-            objects.Add(mapMember);
-          }
-          break;
-      }
-    }
-
-    return objects;
-  }
-
-  private Collection CreateAndCacheMapMemberCollection(ADM.MapMember mapMember, bool isLayerContainer = false)
-  {
-    string mapMemberApplicationId = mapMember.GetSpeckleApplicationId();
-    Collection collection =
-      new()
-      {
-        name = mapMember.Name,
-        applicationId = mapMemberApplicationId,
-        ["type"] = mapMember.GetType().Name
-      };
-
-    switch (mapMember)
-    {
-      case ADM.IDisplayTable displayTable: // get fields from layers that implement IDisplayTable, eg FeatureLayer or StandaloneTable
-        Dictionary<string, string>? fields = displayTable
-          .GetFieldDescriptions()
-          .ToDictionary(field => field.Name, field => field.Type.ToString());
-        collection["fields"] = fields;
-        if (mapMember is ADM.BasicFeatureLayer basicFeatureLayer)
-        {
-          collection["shapeType"] = basicFeatureLayer.ShapeType.ToString();
-        }
-        break;
-
-      case ADM.Layer layer:
-        collection["mapLayerType"] = layer.MapLayerType.ToString();
-        break;
-
-      case ADM.ILayerContainer:
-      default:
-        break;
-    }
-
-    if (!isLayerContainer) // do not cache layer containers, since these won't contain any objects
-    {
-      CollectionCache.Add(mapMemberApplicationId, collection);
-    }
-
-    return collection;
-  }
-}
@@ -1,31 +0,0 @@
-using ArcGIS.Core.Data.Raster;
-
-namespace Speckle.Connectors.ArcGIS.HostApp.Extensions;
-
-public static class SpeckleApplicationIdExtensions
-{
-  /// <summary>
-  /// Retrieves the Speckle application id for map members
-  /// </summary>
-  public static string GetSpeckleApplicationId(this ADM.MapMember mapMember) => mapMember.URI;
-
-  /// <summary>
-  /// Constructs the Speckle application id for Features as a concatenation of the layer URI (applicationId)
-  /// and the row OID (index of row in layer).
-  /// </summary>
-  /// <exception cref="ACD.Exceptions.GeodatabaseException">Throws when this is *not* called on MCT. Use QueuedTask.Run.</exception>
-  public static string GetSpeckleApplicationId(this ACD.Row row, string layerApplicationId) =>
-    $"{layerApplicationId}_{row.GetObjectID()}";
-
-  /// <summary>
-  /// Constructs the Speckle application id for Raster as a concatenation of the layer URI (applicationId) and 0-index
-  /// </summary>
-  public static string GetSpeckleApplicationId(this Raster _, string layerApplicationId) => $"{layerApplicationId}_0";
-
-  /// <summary>
-  /// Constructs the Speckle application id for LasDatasets as a concatenation of the layer URI (applicationId)
-  /// and point OID.
-  /// </summary>
-  public static string GetSpeckleApplicationId(this ACD.Analyst3D.LasPoint point, string layerApplicationId) =>
-    $"{layerApplicationId}_{point.PointID}";
-}
@@ -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);
+}
@@ -12,7 +12,7 @@ using Speckle.Connectors.Common.Operations;
 using Speckle.Converters.ArcGIS3;
 using Speckle.Converters.ArcGIS3.Utils;
 using Speckle.Converters.Common;
-using Speckle.Objects.Data;
+using Speckle.Objects.GIS;
 using Speckle.Objects.Other;
 using Speckle.Sdk;
 using Speckle.Sdk.Models;
@@ -20,6 +20,7 @@ using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.GraphTraversal;
 using Speckle.Sdk.Models.Instances;
 using Speckle.Sdk.Models.Proxies;
+using RasterLayer = Speckle.Objects.GIS.RasterLayer;

 namespace Speckle.Connectors.ArcGIS.Operations.Receive;

@@ -29,6 +30,7 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
  private readonly IFeatureClassUtils _featureClassUtils;
  private readonly ILocalToGlobalUnpacker _localToGlobalUnpacker;
  private readonly LocalToGlobalConverterUtils _localToGlobalConverterUtils;
+  private readonly ICrsUtils _crsUtils;

  // POC: figure out the correct scope to only initialize on Receive
  private readonly IConverterSettingsStore<ArcGISConversionSettings> _settingsStore;
@@ -41,6 +43,7 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
    IFeatureClassUtils featureClassUtils,
    ILocalToGlobalUnpacker localToGlobalUnpacker,
    LocalToGlobalConverterUtils localToGlobalConverterUtils,
+    ICrsUtils crsUtils,
    GraphTraversal traverseFunction,
    ArcGISColorManager colorManager
  )
@@ -52,13 +55,14 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
    _localToGlobalConverterUtils = localToGlobalConverterUtils;
    _traverseFunction = traverseFunction;
    _colorManager = colorManager;
+    _crsUtils = crsUtils;
  }

  public async Task<HostObjectBuilderResult> Build(
    Base rootObject,
    string projectName,
    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed,
    CancellationToken cancellationToken
  )
  {
@@ -66,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>)
@@ -74,18 +78,18 @@ 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;
-    IReadOnlyCollection<LocalToGlobalMap> objectsToConvert = GetObjectsToConvert(rootObject);
+    List<LocalToGlobalMap> objectsToConvert = GetObjectsToConvert(rootObject);
    Dictionary<TraversalContext, ObjectConversionTracker> conversionTracker = new();

    // 1. convert everything
@@ -100,15 +104,13 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
      try
      {
        obj = _localToGlobalConverterUtils.TransformObjects(objectToConvert.AtomicObject, objectToConvert.Matrix);
-        object? conversionResult = await QueuedTask.Run(() => _converter.Convert(obj)).ConfigureAwait(false);
+        object? conversionResult =
+          obj is GisNonGeometricFeature
+            ? null
+            : await QueuedTask.Run(() => _converter.Convert(obj)).ConfigureAwait(false);

        string nestedLayerPath = $"{string.Join("\\", path)}";
-
-        if (obj is ArcgisObject gisObj)
-        {
-          nestedLayerPath += $"\\{gisObj.name}";
-        }
-        else
+        if (objectToConvert.TraversalContext.Parent?.Current is not VectorLayer)
        {
          nestedLayerPath += $"\\{obj.speckle_type.Split(".")[^1]}"; // add sub-layer by speckleType, for non-GIS objects
        }
@@ -123,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);

@@ -159,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)
    {
@@ -221,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
@@ -240,11 +233,15 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
    return new(bakedObjectIds, results);
  }

-  private IReadOnlyCollection<LocalToGlobalMap> GetObjectsToConvert(Base rootObject)
+  private List<LocalToGlobalMap> GetObjectsToConvert(Base rootObject)
  {
    // keep GISlayers in the list, because they are still needed to extract CRS of the commit (code below)
    List<TraversalContext> objectsToConvertTc = _traverseFunction.Traverse(rootObject).ToList();

+    // get CRS from any present VectorLayer
+    Base? vLayer = objectsToConvertTc.FirstOrDefault(x => x.Current is VectorLayer)?.Current;
+    using var crs = _crsUtils.FindSetCrsDataOnReceive(vLayer); // TODO help
+
    // now filter the objects
    objectsToConvertTc = objectsToConvertTc.Where(ctx => ctx.Current is not Collection).ToList();

@@ -298,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)
@@ -413,4 +408,17 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
    var originalPath = reverseOrderPath.Reverse().ToArray();
    return originalPath.Where(x => !string.IsNullOrEmpty(x)).ToArray();
  }
+
+  [Pure]
+  private static bool HasGISParent(TraversalContext context)
+  {
+    List<Base> gisLayers = context.GetAscendants().Where(IsGISType).Where(obj => obj != context.Current).ToList();
+    return gisLayers.Count > 0;
+  }
+
+  [Pure]
+  private static bool IsGISType(Base obj)
+  {
+    return obj is RasterLayer or VectorLayer;
+  }
 }
@@ -1,9 +1,8 @@
-using ArcGIS.Core.Data.Raster;
-using ArcGIS.Core.Geometry;
+using System.Diagnostics;
 using ArcGIS.Desktop.Framework.Threading.Tasks;
+using ArcGIS.Desktop.Mapping;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.ArcGIS.HostApp;
-using Speckle.Connectors.ArcGIS.HostApp.Extensions;
 using Speckle.Connectors.ArcGIS.Utils;
 using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.Common.Caching;
@@ -12,284 +11,196 @@ using Speckle.Connectors.Common.Extensions;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Converters.ArcGIS3;
 using Speckle.Converters.Common;
+using Speckle.Objects.GIS;
 using Speckle.Sdk;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.Proxies;

 namespace Speckle.Connectors.ArcGis.Operations.Send;

 /// <summary>
 /// Stateless builder object to turn an ISendFilter into a <see cref="Base"/> object
 /// </summary>
-public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
+public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>
 {
  private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
  private readonly ISendConversionCache _sendConversionCache;
-  private readonly ArcGISLayerUnpacker _layerUnpacker;
-  private readonly ArcGISColorUnpacker _colorUnpacker;
+  private readonly ArcGISColorManager _colorManager;
  private readonly IConverterSettingsStore<ArcGISConversionSettings> _converterSettings;
+  private readonly MapMembersUtils _mapMemberUtils;
  private readonly ILogger<ArcGISRootObjectBuilder> _logger;
  private readonly ISdkActivityFactory _activityFactory;
-  private readonly MapMembersUtils _mapMemberUtils;

  public ArcGISRootObjectBuilder(
    ISendConversionCache sendConversionCache,
-    ArcGISLayerUnpacker layerUnpacker,
-    ArcGISColorUnpacker colorUnpacker,
+    ArcGISColorManager colorManager,
    IConverterSettingsStore<ArcGISConversionSettings> converterSettings,
    IRootToSpeckleConverter rootToSpeckleConverter,
+    MapMembersUtils mapMemberUtils,
    ILogger<ArcGISRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory,
-    MapMembersUtils mapMemberUtils
+    ISdkActivityFactory activityFactory
  )
  {
    _sendConversionCache = sendConversionCache;
-    _layerUnpacker = layerUnpacker;
-    _colorUnpacker = colorUnpacker;
+    _colorManager = colorManager;
    _converterSettings = converterSettings;
    _rootToSpeckleConverter = rootToSpeckleConverter;
+    _mapMemberUtils = mapMemberUtils;
    _logger = logger;
    _activityFactory = activityFactory;
-    _mapMemberUtils = mapMemberUtils;
  }

+#pragma warning disable CA1506
  public async Task<RootObjectBuilderResult> Build(
-    IReadOnlyList<ADM.MapMember> layers,
+#pragma warning restore CA1506
+    IReadOnlyList<MapMember> objects,
    SendInfo sendInfo,
-    IProgress<CardProgress> onOperationProgressed,
+    Action<string, double?>? onOperationProgressed = null,
    CancellationToken ct = default
  )
  {
    // TODO: add a warning if Geographic CRS is set
    // "Data has been sent in the units 'degrees'. It is advisable to set the project CRS to Projected type (e.g. EPSG:32631) to be able to receive geometry correctly in CAD/BIM software"

+    int count = 0;

-    // 0 - Create Root collection and attach CRS properties
-    // CRS properties are useful for data based workflows coming out of gis applications
-    SpatialReference sr = _converterSettings.Current.ActiveCRSoffsetRotation.SpatialReference;
-    Dictionary<string, object?> spatialReference =
-      new()
-      {
-        ["name"] = sr.Name,
-        ["unit"] = sr.Unit.Name,
-        ["wkid"] = sr.Wkid,
-        ["wkt"] = sr.Wkt,
-      };
+    Collection rootObjectCollection = new() { name = MapView.Active.Map.Name }; //TODO: Collections
+    rootObjectCollection["units"] = _converterSettings.Current.SpeckleUnits;

-    Dictionary<string, object?> crs =
-      new()
-      {
-        ["trueNorthRadians"] = _converterSettings.Current.ActiveCRSoffsetRotation.TrueNorthRadians,
-        ["latOffset"] = _converterSettings.Current.ActiveCRSoffsetRotation.LatOffset,
-        ["lonOffset"] = _converterSettings.Current.ActiveCRSoffsetRotation.LonOffset,
-        ["spatialReference"] = spatialReference
-      };
+    List<SendConversionResult> results = new(objects.Count);
+    var cacheHitCount = 0;
+    List<(GroupLayer, Collection)> nestedGroups = new();

-    Collection rootCollection =
-      new()
-      {
-        name = ADM.MapView.Active.Map.Name,
-        ["units"] = _converterSettings.Current.SpeckleUnits,
-        ["crs"] = crs
-      };
+    // reorder selected layers by Table of Content (TOC) order
+    List<(MapMember, int)> layersWithDisplayPriority = _mapMemberUtils.GetLayerDisplayPriority(
+      MapView.Active.Map,
+      objects
+    );

-    // 1 - Unpack the selected mapmembers
-    // In Arcgis, mapmembers are collections of other mapmember or objects.
-    // We need to unpack the selected mapmembers into all leaf-level mapmembers (containing just objects) and build the root collection structure during unpacking.
-    // Mapmember dynamically attached properties are also added at this step.
-    List<ADM.MapMember> unpackedLayers;
-    ADM.Map map = ADM.MapView.Active.Map;
-    IEnumerable<ADM.MapMember> layersOrdered = _mapMemberUtils.GetMapMembersInOrder(map, layers);
-    using (var _ = _activityFactory.Start("Unpacking selection"))
+    onOperationProgressed?.Invoke("Converting", null);
+    using (var __ = _activityFactory.Start("Converting objects"))
    {
-      unpackedLayers = await QueuedTask
-        .Run(() => _layerUnpacker.UnpackSelectionAsync(layersOrdered, rootCollection))
-        .ConfigureAwait(false);
-    }
-
-    List<SendConversionResult> results = new(unpackedLayers.Count);
-    onOperationProgressed.Report(new("Converting", null));
-    using (var convertingActivity = _activityFactory.Start("Converting objects"))
-    {
-      int count = 0;
-      foreach (ADM.MapMember layer in unpackedLayers)
+      foreach ((MapMember mapMember, _) in layersWithDisplayPriority)
      {
        ct.ThrowIfCancellationRequested();
-        string layerApplicationId = layer.GetSpeckleApplicationId();

-        try
+        using (var convertingActivity = _activityFactory.Start("Converting object"))
        {
-          // get the corresponding collection for this layer - we'll add all converted objects to the collection
-          if (_layerUnpacker.CollectionCache.TryGetValue(layerApplicationId, out Collection? layerCollection))
+          var collectionHost = rootObjectCollection;
+          string applicationId = mapMember.URI;
+          string sourceType = mapMember.GetType().Name;
+
+          Base converted;
+          try
          {
-            var status = Status.SUCCESS;
-            var sdkStatus = SdkActivityStatusCode.Ok;
-
-            // TODO: check cache first to see if this layer was previously converted
-            /*
-            if (_sendConversionCache.TryGetValue(
-              sendInfo.ProjectId,
-              layerApplicationId,
-              out ObjectReference? value
-            ))
+            int groupCount = nestedGroups.Count; // bake here, because count will change in the loop
+            // if the layer is not a part of the group, reset groups
+            for (int i = 0; i < groupCount; i++)
            {
-
+              if (nestedGroups.Count > 0 && !nestedGroups[0].Item1.Layers.Select(x => x.URI).Contains(applicationId))
+              {
+                nestedGroups.RemoveAt(0);
+              }
+              else
+              {
+                // break at the first group, which contains current layer
+                break;
+              }
            }
-            */

-            switch (layer)
+            // don't use cache for group layers
+            if (
+              mapMember is not GroupLayer
+              && _sendConversionCache.TryGetValue(sendInfo.ProjectId, applicationId, out ObjectReference? value)
+            )
            {
-              case ADM.FeatureLayer featureLayer:
-                List<Base> convertedFeatureLayerObjects = await QueuedTask
-                  .Run(() => ConvertFeatureLayerObjectsAsync(featureLayer))
-                  .ConfigureAwait(false);
-                layerCollection.elements.AddRange(convertedFeatureLayerObjects);
-                break;
-              case ADM.RasterLayer rasterLayer:
-                List<Base> convertedRasterLayerObjects = await QueuedTask
-                  .Run(() => ConvertRasterLayerObjectsAsync(rasterLayer))
-                  .ConfigureAwait(false);
-                layerCollection.elements.AddRange(convertedRasterLayerObjects);
-                break;
-              case ADM.LasDatasetLayer lasDatasetLayer:
-                List<Base> convertedLasDatasetObjects = await QueuedTask
-                  .Run(() => ConvertLasDatasetLayerObjectsAsync(lasDatasetLayer))
-                  .ConfigureAwait(false);
-                layerCollection.elements.AddRange(convertedLasDatasetObjects);
-                break;
-              default:
-                status = Status.ERROR;
-                sdkStatus = SdkActivityStatusCode.Error;
-                break;
+              converted = value;
+              cacheHitCount++;
            }
-            results.Add(new(status, layerApplicationId, layer.GetType().Name, layerCollection));
-            convertingActivity?.SetStatus(sdkStatus);
+            else
+            {
+              if (mapMember is GroupLayer group)
+              {
+                // group layer will always come before it's contained layers
+                // keep active group last in the list
+                converted = new Collection();
+                nestedGroups.Insert(0, (group, (Collection)converted));
+              }
+              else
+              {
+                converted = await QueuedTask
+                  .Run(() => (Collection)_rootToSpeckleConverter.Convert(mapMember))
+                  .ConfigureAwait(false);
+
+                // get units & Active CRS (for writing geometry coords)
+                converted["units"] = _converterSettings.Current.SpeckleUnits;
+
+                var spatialRef = _converterSettings.Current.ActiveCRSoffsetRotation.SpatialReference;
+                converted["crs"] = new CRS
+                {
+                  wkt = spatialRef.Wkt,
+                  name = spatialRef.Name,
+                  offset_y = Convert.ToSingle(_converterSettings.Current.ActiveCRSoffsetRotation.LatOffset),
+                  offset_x = Convert.ToSingle(_converterSettings.Current.ActiveCRSoffsetRotation.LonOffset),
+                  rotation = Convert.ToSingle(_converterSettings.Current.ActiveCRSoffsetRotation.TrueNorthRadians),
+                  units_native = _converterSettings.Current.SpeckleUnits
+                };
+              }
+
+              // other common properties for layers and groups
+              converted["name"] = mapMember.Name;
+              converted.applicationId = applicationId;
+            }
+
+            if (
+              nestedGroups.Count == 0
+              || nestedGroups.Count == 1 && nestedGroups[0].Item2.applicationId == applicationId
+            )
+            {
+              // add to host if no groups, or current root group
+              collectionHost.elements.Add(converted);
+            }
+            else
+            {
+              // if we are adding a layer inside the group
+              var parentCollection = nestedGroups.FirstOrDefault(x =>
+                x.Item1.Layers.Select(y => y.URI).Contains(applicationId)
+              );
+              parentCollection.Item2.elements.Add(converted);
+            }
+
+            results.Add(new(Status.SUCCESS, applicationId, sourceType, converted));
+            convertingActivity?.SetStatus(SdkActivityStatusCode.Ok);
          }
-          else
+          catch (Exception ex) when (!ex.IsFatal())
          {
-            throw new SpeckleException($"No converted Collection found for layer {layerApplicationId}.");
+            _logger.LogSendConversionError(ex, sourceType);
+            results.Add(new(Status.ERROR, applicationId, sourceType, null, ex));
+            convertingActivity?.SetStatus(SdkActivityStatusCode.Error);
+            convertingActivity?.RecordException(ex);
          }
        }
-        catch (Exception ex) when (!ex.IsFatal())
-        {
-          _logger.LogSendConversionError(ex, layer.GetType().Name);
-          results.Add(new(Status.ERROR, layerApplicationId, layer.GetType().Name, null, ex));
-          convertingActivity?.SetStatus(SdkActivityStatusCode.Error);
-          convertingActivity?.RecordException(ex);
-        }

-        onOperationProgressed.Report(new("Converting", (double)++count / layers.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.
    }

-    // 3 -  Add Color Proxies
-    rootCollection[ProxyKeys.COLOR] = _colorUnpacker.ColorProxyCache.Values.ToList();
+    // POC: Add Color Proxies
+    List<ColorProxy> colorProxies = _colorManager.UnpackColors(layersWithDisplayPriority);
+    rootObjectCollection[ProxyKeys.COLOR] = colorProxies;

-    return new RootObjectBuilderResult(rootCollection, results);
-  }
+    // POC: Log would be nice, or can be removed.
+    Debug.WriteLine(
+      $"Cache hit count {cacheHitCount} out of {objects.Count} ({(double)cacheHitCount / objects.Count})"
+    );

-  private async Task<List<Base>> ConvertFeatureLayerObjectsAsync(ADM.FeatureLayer featureLayer)
-  {
-    string layerApplicationId = featureLayer.GetSpeckleApplicationId();
-    List<Base> convertedObjects = new();
-    await QueuedTask
-      .Run(() =>
-      {
-        // store the layer renderer for color unpacking
-        _colorUnpacker.StoreRendererAndFields(featureLayer);
-
-        // search the rows of the layer, where each row is treated like an object
-        // RowCursor is IDisposable but is not being correctly picked up by IDE warnings.
-        // This means we need to be carefully adding using statements based on the API documentation coming from each method/class
-        using (ACD.RowCursor rowCursor = featureLayer.Search())
-        {
-          while (rowCursor.MoveNext())
-          {
-            // Same IDisposable issue appears to happen on Row class too. Docs say it should always be disposed of manually by the caller.
-            using (ACD.Row row = rowCursor.Current)
-            {
-              // get application id. test for subtypes before defaulting to base type.
-              Base converted = _rootToSpeckleConverter.Convert(row);
-              string applicationId = row.GetSpeckleApplicationId(layerApplicationId);
-              converted.applicationId = applicationId;
-
-              convertedObjects.Add(converted);
-
-              // process the object color
-              _colorUnpacker.ProcessFeatureLayerColor(row, applicationId);
-            }
-          }
-        }
-      })
-      .ConfigureAwait(false);
-
-    return convertedObjects;
-  }
-
-  // POC: raster colors are stored as mesh vertex colors in RasterToSpeckleConverter. Should probably move to color unpacker.
-  private async Task<List<Base>> ConvertRasterLayerObjectsAsync(ADM.RasterLayer rasterLayer)
-  {
-    string layerApplicationId = rasterLayer.GetSpeckleApplicationId();
-    List<Base> convertedObjects = new();
-    await QueuedTask
-      .Run(() =>
-      {
-        Raster raster = rasterLayer.GetRaster();
-        Base converted = _rootToSpeckleConverter.Convert(raster);
-        string applicationId = raster.GetSpeckleApplicationId(layerApplicationId);
-        converted.applicationId = applicationId;
-        convertedObjects.Add(converted);
-      })
-      .ConfigureAwait(false);
-
-    return convertedObjects;
-  }
-
-  private async Task<List<Base>> ConvertLasDatasetLayerObjectsAsync(ADM.LasDatasetLayer lasDatasetLayer)
-  {
-    string layerApplicationId = lasDatasetLayer.GetSpeckleApplicationId();
-    List<Base> convertedObjects = new();
-
-    try
-    {
-      await QueuedTask
-        .Run(() =>
-        {
-          // store the layer renderer for color unpacking
-          _colorUnpacker.StoreRenderer(lasDatasetLayer);
-
-          using (
-            ACD.Analyst3D.LasPointCursor ptCursor = lasDatasetLayer.SearchPoints(new ACD.Analyst3D.LasPointFilter())
-          )
-          {
-            while (ptCursor.MoveNext())
-            {
-              using (ACD.Analyst3D.LasPoint pt = ptCursor.Current)
-              {
-                Base converted = _rootToSpeckleConverter.Convert(pt);
-                string applicationId = pt.GetSpeckleApplicationId(layerApplicationId);
-                converted.applicationId = applicationId;
-                convertedObjects.Add(converted);
-
-                // process the object color
-                _colorUnpacker.ProcessLasLayerColor(pt, applicationId);
-              }
-            }
-          }
-        })
-        .ConfigureAwait(false);
-    }
-    catch (ACD.Exceptions.TinException ex)
-    {
-      throw new SpeckleException("3D analyst extension is not enabled for .las layer operations", ex);
-    }
-
-    return convertedObjects;
+    return new RootObjectBuilderResult(rootObjectCollection, results);
  }
 }
@@ -5,14 +5,18 @@ using ArcGIS.Desktop.Mapping;
 using ArcGIS.Desktop.Mapping.Events;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
-using Speckle.Connectors.DUI.Utils;
+using Speckle.Newtonsoft.Json;
+using Speckle.Sdk.Common;

 namespace Speckle.Connectors.ArcGIS.Utils;

 public class ArcGISDocumentStore : DocumentModelStore
 {
-  public ArcGISDocumentStore(IJsonSerializer jsonSerializer, ITopLevelExceptionHandler topLevelExceptionHandler)
-    : base(jsonSerializer)
+  public ArcGISDocumentStore(
+    JsonSerializerSettings serializerOption,
+    ITopLevelExceptionHandler topLevelExceptionHandler
+  )
+    : base(serializerOption, true)
  {
    ActiveMapViewChangedEvent.Subscribe(a => topLevelExceptionHandler.CatchUnhandled(() => OnMapViewChanged(a)), true);
    ProjectSavingEvent.Subscribe(
@@ -36,7 +40,7 @@ public class ArcGISDocumentStore : DocumentModelStore
    if (!IsDocumentInit && MapView.Active != null)
    {
      IsDocumentInit = true;
-      LoadState();
+      ReadFromFile();
      OnDocumentChanged();
    }
  }
@@ -48,14 +52,14 @@ public class ArcGISDocumentStore : DocumentModelStore
      return;
    }

-    SaveState();
+    WriteToFile();
  }

  private void OnProjectSaving()
  {
    if (MapView.Active is not null)
    {
-      SaveState();
+      WriteToFile();
    }
  }

@@ -70,11 +74,11 @@ public class ArcGISDocumentStore : DocumentModelStore
    }

    IsDocumentInit = true;
-    LoadState();
+    ReadFromFile();
    OnDocumentChanged();
  }

-  protected override void HostAppSaveState(string modelCardState)
+  public override void WriteToFile()
  {
    Map map = MapView.Active.Map;
    QueuedTask.Run(() =>
@@ -87,7 +91,9 @@ public class ArcGISDocumentStore : DocumentModelStore
        ? XDocument.Parse(existingMetadata)
        : new XDocument(new XElement("metadata"));

-      XElement xmlModelCards = new("SpeckleModelCards", modelCardState);
+      string serializedModels = Serialize();
+
+      XElement xmlModelCards = new("SpeckleModelCards", serializedModels);

      // Check if SpeckleModelCards element already exists at root and update it
      var speckleModelCardsElement = existingXmlDocument.Root?.Element("SpeckleModelCards");
@@ -104,7 +110,7 @@ public class ArcGISDocumentStore : DocumentModelStore
    });
  }

-  protected override void LoadState()
+  public override void ReadFromFile()
  {
    Map map = MapView.Active.Map;
    QueuedTask.Run(() =>
@@ -114,12 +120,12 @@ public class ArcGISDocumentStore : DocumentModelStore
      var element = root?.Element("SpeckleModelCards");
      if (element is null)
      {
-        ClearAndSave();
+        Models = new();
        return;
      }

      string modelsString = element.Value;
-      LoadFromString(modelsString);
+      Models = Deserialize(modelsString).NotNull();
    });
  }
 }
@@ -1,3 +1,4 @@
+using ArcGIS.Desktop.Internal.Mapping;
 using ArcGIS.Desktop.Mapping;

 namespace Speckle.Connectors.ArcGIS.Utils;
@@ -27,35 +28,45 @@ 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;
      }
    }

    return mapMembers;
  }

-  /// <summary>
-  /// Sorts the selected mapmembers into the same order as they appear in the Table of Contents (TOC) bar in the file.
-  /// This is a required step before unpacking layers, because depending on the user selection order, some children layers may appear before their container layer if both the container and children layers are selected.
-  /// </summary>
-  public IEnumerable<MapMember> GetMapMembersInOrder(Map map, IReadOnlyList<MapMember> selectedMapMembers)
+  // Gets the layer display priority for selected layers
+  public List<(MapMember, int)> GetLayerDisplayPriority(Map map, IReadOnlyList<MapMember> selectedMapMembers)
  {
    // first get all map layers
    List<MapMember> allMapMembers = GetAllMapMembers(map);

    // recalculate selected layer priority from all map layers
+    List<(MapMember, int)> selectedLayers = new();
+    int newCount = 0;
    foreach (MapMember mapMember in allMapMembers)
    {
      if (selectedMapMembers.Contains(mapMember))
      {
-        yield return mapMember;
+        selectedLayers.Add((mapMember, newCount));
+        newCount++;
      }
    }
+
+    return selectedLayers;
  }
 }
@@ -76,11 +76,6 @@
        "resolved": "6.0.0",
        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ=="
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -93,17 +88,17 @@
      },
      "Microsoft.Data.Sqlite": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
+        "resolved": "7.0.7",
+        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
+          "Microsoft.Data.Sqlite.Core": "7.0.7",
          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
        }
      },
      "Microsoft.Data.Sqlite.Core": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
+        "resolved": "7.0.7",
+        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
        "dependencies": {
          "SQLitePCLRaw.core": "2.1.4"
        }
@@ -166,6 +161,24 @@
        "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",
@@ -231,9 +244,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -241,8 +253,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -267,7 +278,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -299,36 +310,31 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
+          "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",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
+          "Speckle.Newtonsoft.Json": "13.0.2"
        }
      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
      "System.Threading.Tasks.Dataflow": {
        "type": "CentralTransitive",
        "requested": "[6.0.0, )",
@@ -71,14 +71,6 @@
        "resolved": "6.0.0",
        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -91,17 +83,17 @@
      },
      "Microsoft.Data.Sqlite": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
+        "resolved": "7.0.7",
+        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
+          "Microsoft.Data.Sqlite.Core": "7.0.7",
          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
        }
      },
      "Microsoft.Data.Sqlite.Core": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
+        "resolved": "7.0.7",
+        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
        "dependencies": {
          "SQLitePCLRaw.core": "2.1.4"
        }
@@ -164,6 +156,24 @@
        "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",
@@ -264,9 +274,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -274,8 +283,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -300,7 +308,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -338,36 +346,31 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
+          "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",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
+          "Speckle.Newtonsoft.Json": "13.0.2"
        }
      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
      "System.Threading.Tasks.Dataflow": {
        "type": "CentralTransitive",
        "requested": "[6.0.0, )",
@@ -71,14 +71,6 @@
        "resolved": "6.0.0",
        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -91,17 +83,17 @@
      },
      "Microsoft.Data.Sqlite": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
+        "resolved": "7.0.7",
+        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
+          "Microsoft.Data.Sqlite.Core": "7.0.7",
          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
        }
      },
      "Microsoft.Data.Sqlite.Core": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
+        "resolved": "7.0.7",
+        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
        "dependencies": {
          "SQLitePCLRaw.core": "2.1.4"
        }
@@ -164,6 +156,24 @@
        "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",
@@ -264,9 +274,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -274,8 +283,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -300,7 +308,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -338,36 +346,31 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
+          "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",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
+          "Speckle.Newtonsoft.Json": "13.0.2"
        }
      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
      "System.Threading.Tasks.Dataflow": {
        "type": "CentralTransitive",
        "requested": "[6.0.0, )",
@@ -71,14 +71,6 @@
        "resolved": "6.0.0",
        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -91,17 +83,17 @@
      },
      "Microsoft.Data.Sqlite": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
+        "resolved": "7.0.7",
+        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
+          "Microsoft.Data.Sqlite.Core": "7.0.7",
          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
        }
      },
      "Microsoft.Data.Sqlite.Core": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
+        "resolved": "7.0.7",
+        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
        "dependencies": {
          "SQLitePCLRaw.core": "2.1.4"
        }
@@ -164,6 +156,24 @@
        "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",
@@ -264,9 +274,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -274,8 +283,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -301,7 +309,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -339,36 +347,31 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
+          "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",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
+          "Speckle.Newtonsoft.Json": "13.0.2"
        }
      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
      "System.Threading.Tasks.Dataflow": {
        "type": "CentralTransitive",
        "requested": "[6.0.0, )",
@@ -82,17 +82,17 @@
      },
      "Microsoft.Data.Sqlite": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
+        "resolved": "7.0.7",
+        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
+          "Microsoft.Data.Sqlite.Core": "7.0.7",
          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
        }
      },
      "Microsoft.Data.Sqlite.Core": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
+        "resolved": "7.0.7",
+        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
        "dependencies": {
          "SQLitePCLRaw.core": "2.1.4"
        }
@@ -155,6 +155,24 @@
        "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",
@@ -220,9 +238,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -230,8 +247,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -257,7 +273,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -295,35 +311,31 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
+        "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",
-          "Microsoft.Data.Sqlite": "7.0.5",
+          "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",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
+          "Speckle.Newtonsoft.Json": "13.0.2"
        }
      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
      "System.Threading.Tasks.Dataflow": {
        "type": "CentralTransitive",
        "requested": "[6.0.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;
  }

@@ -66,23 +66,23 @@ public class AutocadBasicConnectorBinding : IBasicConnectorBinding

  public DocumentModelStore GetDocumentState() => _store;

-  public void AddModel(ModelCard model) => _store.AddModel(model);
+  public void AddModel(ModelCard model) => _store.Models.Add(model);

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

  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;
@@ -104,7 +104,7 @@ public class AutocadBasicConnectorBinding : IBasicConnectorBinding

    if (model is SenderModelCard senderModelCard)
    {
-      var dbObjects = doc.GetObjects(senderModelCard.SendFilter.NotNull().RefreshObjectIds());
+      var dbObjects = doc.GetObjects(senderModelCard.SendFilter.NotNull().GetObjectIds());
      objectIds = dbObjects.Select(tuple => tuple.Root.Id).ToArray();
    }

@@ -116,79 +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.
-              // may also throw Autodesk.AutoCAD.Runtime.Exception for invalid extents on objects like rays and xlines
-            }
-          }
-
-          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,218 +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),
-      async () => await RunExpirationChecks().ConfigureAwait(false)
-    );
-  }
-
-  private async Task 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().RefreshObjectIds().Intersect(objectIdsList).ToList();
-      bool isExpired = intersection.Count != 0;
-      if (isExpired)
-      {
-        expiredSenderIds.Add(modelCard.ModelCardId.NotNull());
-      }
-    }
-
-    await Commands.SetModelsExpired(expiredSenderIds).ConfigureAwait(false);
-    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().RefreshObjectIds()
-      );
-
-      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,7 @@ 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;
 using Speckle.Sdk.Models.GraphTraversal;
@@ -24,12 +24,13 @@ public static class SharedRegistration
  public static void AddAutocadBase(this IServiceCollection serviceCollection)
  {
    serviceCollection.AddConnectorUtils();
-    serviceCollection.AddDUI<AutocadDocumentStore>();
+    serviceCollection.AddDUI();
    serviceCollection.AddDUIView();

    // Register other connector specific types
    serviceCollection.AddTransient<TransactionContext>();
    serviceCollection.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext
+    serviceCollection.AddSingleton<DocumentModelStore, AutocadDocumentStore>();
    serviceCollection.AddSingleton<AutocadContext>();

    // Unpackers and builders
@@ -48,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>();
@@ -69,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>();

@@ -4,10 +4,7 @@ namespace Speckle.Connectors.Autocad.Filters;

 public class AutocadSelectionFilter : DirectSelectionSendFilter
 {
-  public AutocadSelectionFilter()
-  {
-    IsDefault = true;
-  }
+  public override List<string> GetObjectIds() => SelectedObjectIds;

-  public override List<string> RefreshObjectIds() => SelectedObjectIds;
+  public override bool CheckExpiry(string[] changedObjectIds) => SelectedObjectIds.Intersect(changedObjectIds).Any();
 }
@@ -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,14 +28,14 @@ public class AutocadColorBaker
  /// </summary>
  /// <param name="colorProxies"></param>
  /// <param name="onOperationProgressed"></param>
-  public void 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")
@@ -1,6 +1,7 @@
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
-using Speckle.Connectors.DUI.Utils;
+using Speckle.Newtonsoft.Json;
+using Speckle.Sdk.Common;

 namespace Speckle.Connectors.Autocad.HostApp;

@@ -11,11 +12,11 @@ public class AutocadDocumentStore : DocumentModelStore
  private readonly AutocadDocumentManager _autocadDocumentManager;

  public AutocadDocumentStore(
-    IJsonSerializer jsonSerializer,
+    JsonSerializerSettings jsonSerializerSettings,
    AutocadDocumentManager autocadDocumentManager,
    ITopLevelExceptionHandler topLevelExceptionHandler
  )
-    : base(jsonSerializer)
+    : base(jsonSerializerSettings, true)
  {
    _autocadDocumentManager = autocadDocumentManager;
    _previousDocName = _nullDocumentName;
@@ -47,31 +48,32 @@ public class AutocadDocumentStore : DocumentModelStore
    }

    _previousDocName = currentDocName;
-    LoadState();
+    ReadFromFile();
    OnDocumentChanged();
  }

-  protected override void LoadState()
+  public override void ReadFromFile()
  {
+    Models = new();
+
    // POC: Will be addressed to move it into AutocadContext!
    Document? doc = Application.DocumentManager.MdiActiveDocument;

    if (doc == null)
    {
-      ClearAndSave();
      return;
    }

    string? serializedModelCards = _autocadDocumentManager.ReadModelCards(doc);
    if (serializedModelCards == null)
    {
-      ClearAndSave();
      return;
    }
-    LoadFromString(serializedModelCards);
+
+    Models = Deserialize(serializedModelCards).NotNull();
  }

-  protected override void HostAppSaveState(string modelCardState)
+  public override void WriteToFile()
  {
    // POC: Will be addressed to move it into AutocadContext!
    Document doc = Application.DocumentManager.MdiActiveDocument;
@@ -81,6 +83,7 @@ public class AutocadDocumentStore : DocumentModelStore
      return;
    }

-    _autocadDocumentManager.WriteModelCards(doc, modelCardState);
+    string modelCardsString = Serialize();
+    _autocadDocumentManager.WriteModelCards(doc, modelCardsString);
  }
 }
@@ -2,7 +2,6 @@ using Autodesk.AutoCAD.DatabaseServices;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Sdk;
-using Speckle.Sdk.Dependencies;
 using Speckle.Sdk.Models.Proxies;

 namespace Speckle.Connectors.Autocad.HostApp;
@@ -30,12 +29,12 @@ public class AutocadGroupBaker
  /// <param name="applicationIdMap"></param>
  /// <returns></returns>
  // TODO: Oguzhan! Do not report here too! But this is TBD that we don't know the shape of the report yet.
-  public IReadOnlyCollection<ReceiveConversionResult> CreateGroups(
+  public List<ReceiveConversionResult> CreateGroups(
    IEnumerable<GroupProxy> groupProxies,
-    Dictionary<string, IReadOnlyCollection<Entity>> applicationIdMap
+    Dictionary<string, List<Entity>> applicationIdMap
  )
  {
-    HashSet<ReceiveConversionResult> results = new();
+    List<ReceiveConversionResult> results = new();

    using var groupCreationTransaction =
      Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
@@ -76,6 +75,6 @@ public class AutocadGroupBaker

    groupCreationTransaction.Commit();

-    return results.Freeze();
+    return results;
  }
 }
@@ -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,18 +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.Dependencies;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
@@ -23,7 +19,7 @@ namespace Speckle.Connectors.Autocad.HostApp;
 /// <summary>
 /// Expects to be a scoped dependency receive operation.
 /// </summary>
-public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
+public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
 {
  private readonly AutocadLayerBaker _layerBaker;
  private readonly AutocadColorBaker _colorBaker;
@@ -49,12 +45,11 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
    _converterSettings = converterSettings;
  }

-  [SuppressMessage("Maintainability", "CA1506:Avoid excessive class coupling")]
  public BakeResult BakeInstances(
-    ICollection<(Collection[] collectionPath, IInstanceComponent obj)> instanceComponents,
-    Dictionary<string, IReadOnlyCollection<Entity>> applicationIdMap,
+    List<(Collection[] collectionPath, IInstanceComponent obj)> instanceComponents,
+    Dictionary<string, List<Entity>> applicationIdMap,
    string baseLayerName,
-    IProgress<CardProgress> onOperationProgressed
+    Action<string, double?>? onOperationProgressed
  )
  {
    var sortedInstanceComponents = instanceComponents
@@ -65,24 +60,21 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
    var definitionIdAndApplicationIdMap = new Dictionary<string, ObjectId>();

    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
-    var conversionResults = new HashSet<ReceiveConversionResult>();
-    var createdObjectIds = new HashSet<string>();
-    var consumedObjectIds = new HashSet<string>();
+    var conversionResults = new List<ReceiveConversionResult>();
+    var createdObjectIds = new List<string>();
+    var consumedObjectIds = new List<string>();
    var count = 0;

    foreach (var (collectionPath, instanceOrDefinition) in sortedInstanceComponents)
    {
      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)
          var constituentEntities = definitionProxy
-            .objects.Select(id =>
-              applicationIdMap.TryGetValue(id, out IReadOnlyCollection<Entity>? value) ? value : null
-            )
+            .objects.Select(id => applicationIdMap.TryGetValue(id, out List<Entity>? value) ? value : null)
            .Where(x => x is not null)
            .SelectMany(ent => ent!)
            .ToList();
@@ -112,8 +104,8 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
          definitionIdAndApplicationIdMap[definitionProxy.applicationId] = id;
          transaction.AddNewlyCreatedDBObject(record, true);
          var consumedEntitiesHandleValues = constituentEntities.Select(ent => ent.GetSpeckleApplicationId()).ToArray();
-          consumedObjectIds.UnionWith(consumedEntitiesHandleValues);
-          createdObjectIds.RemoveWhere(newId => consumedEntitiesHandleValues.Contains(newId));
+          consumedObjectIds.AddRange(consumedEntitiesHandleValues);
+          createdObjectIds.RemoveAll(newId => consumedEntitiesHandleValues.Contains(newId));
        }
        else if (
          instanceOrDefinition is InstanceProxy instanceProxy
@@ -131,7 +123,7 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
          string layerName = _layerBaker.CreateLayerForReceive(collectionPath, baseLayerName);

          // get color and material if any
-          string instanceId = instanceProxy.applicationId ?? instanceProxy.id.NotNull();
+          string instanceId = instanceProxy.applicationId ?? instanceProxy.id;
          AutocadColor? objColor = _colorBaker.ObjectColorsIdMap.TryGetValue(instanceId, out AutocadColor? color)
            ? color
            : null;
@@ -170,7 +162,7 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
    }

    transaction.Commit();
-    return new(createdObjectIds.Freeze(), consumedObjectIds.Freeze(), conversionResults.Freeze());
+    return new(createdObjectIds, consumedObjectIds, conversionResults);
  }

  /// <summary>
@@ -2,7 +2,6 @@
 using Autodesk.AutoCAD.EditorInput;
 using Autodesk.AutoCAD.LayerManager;
 using Speckle.Connectors.Common.Operations.Receive;
-using Speckle.Sdk.Common;
 using Speckle.Sdk.Models.Collections;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;

@@ -53,7 +52,7 @@ public class AutocadLayerBaker : TraversalContextUnpacker
      // Goes up the tree to find any potential parent layer that has a material/color
      for (int j = layerPath.Length - 1; j >= 0; j--)
      {
-        string layerId = layerPath[j].applicationId ?? layerPath[j].id.NotNull();
+        string layerId = layerPath[j].applicationId ?? layerPath[j].id;

        if (!foundColor)
        {
@@ -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,10 +3,8 @@ 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.Common;
 using Speckle.Sdk.Models;
 using Material = Autodesk.AutoCAD.DatabaseServices.Material;
 using RenderMaterial = Speckle.Objects.Other.RenderMaterial;
@@ -43,7 +41,7 @@ public class AutocadMaterialBaker
  public bool TryGetMaterialId(Base originalObject, Base? parentObject, out ObjectId materialId)
  {
    materialId = ObjectId.Null;
-    var originalObjectId = originalObject.applicationId ?? originalObject.id.NotNull();
+    var originalObjectId = originalObject.applicationId ?? originalObject.id;
    if (ObjectMaterialsIdMap.TryGetValue(originalObjectId, out ObjectId originalObjectMaterialId))
    {
      materialId = originalObjectMaterialId;
@@ -55,7 +53,7 @@ public class AutocadMaterialBaker
      return false;
    }

-    var subObjectId = parentObject.applicationId ?? parentObject.id.NotNull();
+    var subObjectId = parentObject.applicationId ?? parentObject.id;
    if (ObjectMaterialsIdMap.TryGetValue(subObjectId, out ObjectId subObjectMaterialId))
    {
      materialId = subObjectMaterialId;
@@ -93,9 +91,9 @@ public class AutocadMaterialBaker
  }

  public void ParseAndBakeRenderMaterials(
-    IReadOnlyCollection<RenderMaterialProxy> materialProxies,
+    List<RenderMaterialProxy> materialProxies,
    string baseLayerPrefix,
-    IProgress<CardProgress> onOperationProgressed
+    Action<string, double?>? onOperationProgressed
  )
  {
    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
@@ -111,11 +109,11 @@ 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;
-      string renderMaterialId = renderMaterial.applicationId ?? renderMaterial.id.NotNull();
+      string renderMaterialId = renderMaterial.applicationId ?? renderMaterial.id;
      ObjectId materialId = ObjectId.Null;

      if (!ObjectMaterialsIdMap.TryGetValue(renderMaterialId, out materialId))
@@ -156,7 +154,7 @@ public class AutocadMaterialBaker
    {
      // POC: Currently we're relying on the render material name for identification if it's coming from speckle and from which model; could we do something else?
      // POC: we should assume render materials all have application ids?
-      string renderMaterialId = renderMaterial.applicationId ?? renderMaterial.id.NotNull();
+      string renderMaterialId = renderMaterial.applicationId ?? renderMaterial.id;
      string matName = _autocadContext.RemoveInvalidChars(
        $"{renderMaterial.name}-({renderMaterialId})-{baseLayerPrefix}"
      );
@@ -70,7 +70,7 @@ public class AutocadMaterialUnpacker
      }
    }

-    // Stage 2: make sure we collect layer materials as well
+    // Stage 2: make sure we collect layer colors as well
    foreach (LayerTableRecord layer in layers)
    {
      try
@@ -110,14 +110,10 @@ public class AutocadMaterialUnpacker
      diffuseColor.Blue
    );

-    RenderMaterial renderMaterial =
-      new()
-      {
-        name = material.Name,
-        opacity = material.Opacity.Percentage,
-        diffuse = diffuse.ToArgb(),
-        applicationId = id
-      };
+    string name = material.Name;
+    double opacity = material.Opacity.Percentage;
+
+    RenderMaterial renderMaterial = new(opacity: opacity, diffuse: diffuse) { name = name, applicationId = id };

    // Add additional properties
    renderMaterial["ior"] = material.Refraction.Index;
@@ -3,13 +3,10 @@ using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Extensions;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Common.Operations.Receive;
 using Speckle.Converters.Common;
 using Speckle.Sdk;
-using Speckle.Sdk.Common;
-using Speckle.Sdk.Dependencies;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
@@ -55,133 +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 Task.CompletedTask.ConfigureAwait(true);
-        return BuildSync(rootObject, projectName, modelName, onOperationProgressed);
-      })
-      .ConfigureAwait(false);
-  }
-
-  private HostObjectBuilderResult BuildSync(
-    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)
-    {
-      _materialBaker.ParseAndBakeRenderMaterials(
-        unpackedRoot.RenderMaterialProxies,
+      // POC: these are not captured by traversal, so we need to re-add them here
+      if (unpackedRoot.DefinitionProxies != null && unpackedRoot.DefinitionProxies.Count > 0)
+      {
+        var transformed = unpackedRoot.DefinitionProxies.Select(proxy =>
+          (Array.Empty<Collection>(), proxy as IInstanceComponent)
+        );
+        instanceComponentsWithPath.AddRange(transformed);
+      }
+
+      // 3 - Bake materials and colors, as they are used later down the line by layers and objects
+      if (unpackedRoot.RenderMaterialProxies != null)
+      {
+        _materialBaker.ParseAndBakeRenderMaterials(
+          unpackedRoot.RenderMaterialProxies,
+          baseLayerPrefix,
+          onOperationProgressed
+        );
+      }
+
+      if (unpackedRoot.ColorProxies != null)
+      {
+        _colorBaker.ParseColors(unpackedRoot.ColorProxies, onOperationProgressed);
+      }
+
+      // 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();
+
+          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
      );
-    }

-    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
-    HashSet<ReceiveConversionResult> results = new();
-    HashSet<string> bakedObjectIds = new();
-    Dictionary<string, IReadOnlyCollection<Entity>> applicationIdMap = new();
-    var count = 0;
-    foreach (var (layerPath, atomicObject) in atomicObjectsWithPath)
-    {
-      string objectId = atomicObject.applicationId ?? atomicObject.id.NotNull();
-      onOperationProgressed.Report(new("Converting objects", (double)++count / atomicObjects.Count));
-      try
+      // 7 - Create groups
+      if (unpackedRoot.GroupProxies != null)
      {
-        IReadOnlyCollection<Entity> convertedObjects = ConvertObject(atomicObject, layerPath, baseLayerPrefix);
-
-        applicationIdMap[objectId] = convertedObjects;
-
-        results.UnionWith(
-          convertedObjects.Select(e => new ReceiveConversionResult(
-            Status.SUCCESS,
-            atomicObject,
-            e.GetSpeckleApplicationId(),
-            e.GetType().ToString()
-          ))
+        List<ReceiveConversionResult> groupResults = _groupBaker.CreateGroups(
+          unpackedRoot.GroupProxies,
+          applicationIdMap
        );
-
-        bakedObjectIds.UnionWith(convertedObjects.Select(e => e.GetSpeckleApplicationId()));
+        results.AddRange(groupResults);
      }
-      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
-    );
-
-    bakedObjectIds.RemoveWhere(id => consumedObjectIds.Contains(id));
-    bakedObjectIds.UnionWith(createdInstanceIds);
-    results.RemoveWhere(result => result.ResultId != null && consumedObjectIds.Contains(result.ResultId));
-    results.UnionWith(instanceConversionResults);
-
-    // 7 - Create groups
-    if (unpackedRoot.GroupProxies != null)
-    {
-      IReadOnlyCollection<ReceiveConversionResult> groupResults = _groupBaker.CreateGroups(
-        unpackedRoot.GroupProxies,
-        applicationIdMap
-      );
-      results.UnionWith(groupResults);
-    }
-
-    return new HostObjectBuilderResult(bakedObjectIds, results);
-  }
+      return new HostObjectBuilderResult(bakedObjectIds, results);
+    });

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

-  private IReadOnlyCollection<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 HashSet<Entity>();
+    var convertedEntities = new List<Entity>();

    using var tr = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();

@@ -206,19 +188,19 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
      var bakedEntity = BakeObject(entity, obj, layerName);
      convertedEntities.Add(bakedEntity);
    }
-    else if (converted is List<(Entity, Base)> fallbackConversionResult)
+    else if (converted is IEnumerable<(object, Base)> fallbackConversionResult)
    {
      var bakedFallbackEntities = BakeObjectsAsGroup(fallbackConversionResult, obj, layerName, baseLayerNamePrefix);
-      convertedEntities.UnionWith(bakedFallbackEntities);
+      convertedEntities.AddRange(bakedFallbackEntities);
    }

    tr.Commit();
-    return convertedEntities.Freeze();
+    return convertedEntities;
  }

  private Entity BakeObject(Entity entity, Base originalObject, string layerName, Base? parentObject = null)
  {
-    var objId = originalObject.applicationId ?? originalObject.id.NotNull();
+    var objId = originalObject.applicationId ?? originalObject.id;
    if (_colorBaker.ObjectColorsIdMap.TryGetValue(objId, out AutocadColor? color))
    {
      entity.Color = color;
@@ -234,7 +216,7 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
  }

  private List<Entity> BakeObjectsAsGroup(
-    List<(Entity, Base)> fallbackConversionResult,
+    IEnumerable<(object, Base)> fallbackConversionResult,
    Base parentObject,
    string layerName,
    string baseLayerName
@@ -244,9 +226,15 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
    var entities = new List<Entity>();
    foreach (var (conversionResult, originalObject) in fallbackConversionResult)
    {
-      BakeObject(conversionResult, originalObject, layerName, parentObject);
-      ids.Add(conversionResult.ObjectId);
-      entities.Add(conversionResult);
+      if (conversionResult is not Entity entity)
+      {
+        // TODO: throw?
+        continue;
+      }
+
+      BakeObject(entity, originalObject, layerName, parentObject);
+      ids.Add(entity.ObjectId);
+      entities.Add(entity);
    }

    var tr = Application.DocumentManager.CurrentDocument.Database.TransactionManager.TopTransaction;
@@ -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,389 +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.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "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.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
-        "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=="
-      },
-      "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.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
-        }
-      },
-      "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.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
-          "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.219, )"
-        }
-      },
-      "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.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
-        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
-      "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;CIVIL3D2022_OR_GREATER;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,389 +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.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "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.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
-        "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=="
-      },
-      "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.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
-        }
-      },
-      "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.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
-          "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.219, )"
-        }
-      },
-      "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.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
-        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
-      "System.Threading.Tasks.Dataflow": {
-        "type": "CentralTransitive",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA=="
-      }
-    }
-  }
-}
@@ -4,7 +4,7 @@
    <PlatformTarget>x64</PlatformTarget>
    <UseWpf>true</UseWpf>
    <Civil3DVersion>2024</Civil3DVersion>
-    <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER</DefineConstants>
+    <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2024_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
    <StartAction>Program</StartAction>
    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
@@ -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>
@@ -80,14 +80,6 @@
        "resolved": "6.0.0",
        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -100,17 +92,17 @@
      },
      "Microsoft.Data.Sqlite": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
+        "resolved": "7.0.7",
+        "contentHash": "tiNmV1oPy+Z2R7Wd0bPB/FxCr8B+/5q11OpDMG751GA/YuOL7MZrBFfzv5oFRlFe08K6sjrnbrauzzGIeNrzLQ==",
        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
+          "Microsoft.Data.Sqlite.Core": "7.0.7",
          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
        }
      },
      "Microsoft.Data.Sqlite.Core": {
        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
+        "resolved": "7.0.7",
+        "contentHash": "21FRzcJhaTrlv7kTrqr/ltFcSQM2TyuTTPhUcjO8H73od7Bb3QraNW90c7lUucNI/245XPkKZG4fp7/7OsKCSg==",
        "dependencies": {
          "SQLitePCLRaw.core": "2.1.4"
        }
@@ -173,6 +165,24 @@
        "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",
@@ -273,9 +283,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )"
        }
      },
      "speckle.connectors.dui": {
@@ -283,8 +292,7 @@
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
+          "Speckle.Sdk": "[3.1.0-dev.146, )",
          "System.Threading.Tasks.Dataflow": "[6.0.0, )"
        }
      },
@@ -310,7 +318,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )"
+          "Speckle.Objects": "[3.1.0-dev.146, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -348,36 +356,31 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
+          "Speckle.Sdk": "3.1.0-dev.146"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
+        "requested": "[3.1.0-dev.146, )",
+        "resolved": "3.1.0-dev.146",
+        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
+          "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",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
+          "Speckle.Newtonsoft.Json": "13.0.2"
        }
      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
      "System.Threading.Tasks.Dataflow": {
        "type": "CentralTransitive",
        "requested": "[6.0.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;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER</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,358 +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.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
-        "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=="
-      },
-      "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.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
-        }
-      },
-      "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.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
-          "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.219, )"
-        }
-      },
-      "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.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
-        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
-      "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>
@@ -1,66 +0,0 @@
-using Speckle.Connectors.CSiShared.HostApp;
-using Speckle.Connectors.CSiShared.Utils;
-using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
-
-namespace Speckle.Connectors.CSiShared.Bindings;
-
-public class CsiSharedSelectionBinding : ISelectionBinding
-{
-  public string Name => "selectionBinding";
-  public IBrowserBridge Parent { get; }
-  private readonly ICsiApplicationService _csiApplicationService;
-
-  public CsiSharedSelectionBinding(IBrowserBridge parent, ICsiApplicationService csiApplicationService)
-  {
-    Parent = parent;
-    _csiApplicationService = csiApplicationService;
-  }
-
-  /// <summary>
-  /// Gets the selection and creates an encoded ID (objectType and objectName).
-  /// </summary>
-  /// <remarks>
-  /// Refer to ObjectIdentifier.cs for more info.
-  /// </remarks>
-  public SelectionInfo GetSelection()
-  {
-    // TODO: Since this is standard across CSi Suite - better stored in an enum?
-    var objectTypeMap = new Dictionary<int, string>
-    {
-      { 1, "Point" },
-      { 2, "Frame" },
-      { 3, "Cable" },
-      { 4, "Tendon" },
-      { 5, "Area" },
-      { 6, "Solid" },
-      { 7, "Link" }
-    };
-
-    int numberItems = 0;
-    int[] objectType = Array.Empty<int>();
-    string[] objectName = Array.Empty<string>();
-
-    _csiApplicationService.SapModel.SelectObj.GetSelected(ref numberItems, ref objectType, ref objectName);
-
-    var encodedIds = new List<string>(numberItems);
-    var typeCounts = new Dictionary<string, int>();
-
-    for (int i = 0; i < numberItems; i++)
-    {
-      var typeKey = objectType[i];
-      var typeName = objectTypeMap.TryGetValue(typeKey, out var name) ? name : $"Unknown ({typeKey})";
-
-      encodedIds.Add(ObjectIdentifier.Encode(typeKey, objectName[i]));
-      typeCounts[typeName] = (typeCounts.TryGetValue(typeName, out var count) ? count : 0) + 1; // NOTE: Cross-framework compatibility (net 48 and net8)
-    }
-
-    var summary =
-      encodedIds.Count == 0
-        ? "No objects selected."
-        : $"{encodedIds.Count} objects ({string.Join(", ", 
-            typeCounts.Select(kv => $"{kv.Value} {kv.Key}"))})";
-
-    return new SelectionInfo(encodedIds, summary);
-  }
-}
@@ -1,138 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.CSiShared.HostApp;
-using Speckle.Connectors.CSiShared.Utils;
-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.Common;
-using Speckle.Converters.CSiShared;
-using Speckle.Sdk;
-using Speckle.Sdk.Common;
-using Speckle.Sdk.Logging;
-
-namespace Speckle.Connectors.CSiShared.Bindings;
-
-public sealed class CsiSharedSendBinding : ISendBinding
-{
-  public string Name => "sendBinding";
-  public SendBindingUICommands Commands { get; }
-  public IBrowserBridge Parent { get; }
-
-  private readonly DocumentModelStore _store;
-  private readonly IAppIdleManager _idleManager;
-  private readonly IServiceProvider _serviceProvider;
-  private readonly List<ISendFilter> _sendFilters;
-  private readonly CancellationManager _cancellationManager;
-  private readonly IOperationProgressManager _operationProgressManager;
-  private readonly ILogger<CsiSharedSendBinding> _logger;
-  private readonly ICsiApplicationService _csiApplicationService;
-  private readonly ICsiConversionSettingsFactory _csiConversionSettingsFactory;
-  private readonly ISpeckleApplication _speckleApplication;
-  private readonly ISdkActivityFactory _activityFactory;
-
-  public CsiSharedSendBinding(
-    DocumentModelStore store,
-    IAppIdleManager idleManager,
-    IBrowserBridge parent,
-    IEnumerable<ISendFilter> sendFilters,
-    IServiceProvider serviceProvider,
-    CancellationManager cancellationManager,
-    IOperationProgressManager operationProgressManager,
-    ILogger<CsiSharedSendBinding> logger,
-    ICsiConversionSettingsFactory csiConversionSettingsFactory,
-    ISpeckleApplication speckleApplication,
-    ISdkActivityFactory activityFactory,
-    ICsiApplicationService csiApplicationService
-  )
-  {
-    _store = store;
-    _idleManager = idleManager;
-    _serviceProvider = serviceProvider;
-    _sendFilters = sendFilters.ToList();
-    _cancellationManager = cancellationManager;
-    _operationProgressManager = operationProgressManager;
-    _logger = logger;
-    Parent = parent;
-    Commands = new SendBindingUICommands(parent);
-    _csiConversionSettingsFactory = csiConversionSettingsFactory;
-    _speckleApplication = speckleApplication;
-    _activityFactory = activityFactory;
-    _csiApplicationService = csiApplicationService;
-  }
-
-  public List<ISendFilter> GetSendFilters() => _sendFilters;
-
-  public List<ICardSetting> GetSendSettings() => [];
-
-  public async Task Send(string modelCardId)
-  {
-    using var activity = _activityFactory.Start();
-
-    try
-    {
-      if (_store.GetModelById(modelCardId) is not SenderModelCard modelCard)
-      {
-        throw new InvalidOperationException("No publish model card was found.");
-      }
-      using var scope = _serviceProvider.CreateScope();
-      scope
-        .ServiceProvider.GetRequiredService<IConverterSettingsStore<CsiConversionSettings>>()
-        .Initialize(_csiConversionSettingsFactory.Create(_csiApplicationService.SapModel));
-
-      CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
-
-      List<ICsiWrapper> wrappers = modelCard
-        .SendFilter.NotNull()
-        .RefreshObjectIds()
-        .Select(DecodeObjectIdentifier)
-        .ToList();
-
-      if (wrappers.Count == 0)
-      {
-        throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
-      }
-
-      var sendResult = await scope
-        .ServiceProvider.GetRequiredService<SendOperation<ICsiWrapper>>()
-        .Execute(
-          wrappers,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
-          cancellationToken
-        )
-        .ConfigureAwait(false);
-
-      await Commands
-        .SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults)
-        .ConfigureAwait(false);
-    }
-    catch (OperationCanceledException)
-    {
-      return;
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
-    }
-  }
-
-  private ICsiWrapper DecodeObjectIdentifier(string encodedId)
-  {
-    var (type, name) = ObjectIdentifier.Decode(encodedId);
-    return CsiWrapperFactory.Create(type, name);
-  }
-
-  public void CancelSend(string modelCardId)
-  {
-    _cancellationManager.CancelOperation(modelCardId);
-  }
-}
@@ -1,13 +0,0 @@
-using Speckle.Connectors.DUI.Models.Card.SendFilter;
-
-namespace Speckle.Connectors.CSiShared.Filters;
-
-public class CsiSharedSelectionFilter : DirectSelectionSendFilter
-{
-  public CsiSharedSelectionFilter()
-  {
-    IsDefault = true;
-  }
-
-  public override List<string> RefreshObjectIds() => SelectedObjectIds;
-}
@@ -1 +0,0 @@
-global using CSiAPIv1;
@@ -1,34 +0,0 @@
-namespace Speckle.Connectors.CSiShared.HostApp;
-
-/// <summary>
-/// Create a centralized access point for ETABS and SAP APIs across the entire program.
-/// </summary>
-/// <remarks>
-/// All API methods are based on the objectType and objectName, not the GUID.
-/// CSi is already giving us the "sapModel" reference through the plugin interface. No need to attach to running instance.
-/// Since objectType is a single int (1, 2 ... 7) we know first index will always be the objectType.
-/// Prevent having to pass the "sapModel" around between classes and this ensures consistent access.
-/// Name "sapModel" is misleading since it doesn't only apply to SAP2000, but this is the convention in the API, so we keep it.
-/// </remarks>
-public interface ICsiApplicationService
-{
-  cSapModel SapModel { get; }
-  void Initialize(cSapModel sapModel, cPluginCallback pluginCallback);
-}
-
-public class CsiApplicationService : ICsiApplicationService
-{
-  public cSapModel SapModel { get; private set; }
-  private cPluginCallback _pluginCallback;
-
-  public CsiApplicationService()
-  {
-    SapModel = null!;
-  }
-
-  public void Initialize(cSapModel sapModel, cPluginCallback pluginCallback)
-  {
-    SapModel = sapModel;
-    _pluginCallback = pluginCallback;
-  }
-}
@@ -1,79 +0,0 @@
-using System.IO;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.DUI.Models;
-using Speckle.Connectors.DUI.Utils;
-using Speckle.Sdk;
-using Speckle.Sdk.Helpers;
-using Speckle.Sdk.Logging;
-
-namespace Speckle.Connectors.CSiShared.HostApp;
-
-public class CsiDocumentModelStore : DocumentModelStore
-{
-  private readonly ISpeckleApplication _speckleApplication;
-  private readonly ILogger<CsiDocumentModelStore> _logger;
-  private readonly ICsiApplicationService _csiApplicationService;
-  private string HostAppUserDataPath { get; set; }
-  private string DocumentStateFile { get; set; }
-  private string ModelPathHash { get; set; }
-
-  public CsiDocumentModelStore(
-    IJsonSerializer jsonSerializerSettings,
-    ISpeckleApplication speckleApplication,
-    ILogger<CsiDocumentModelStore> logger,
-    ICsiApplicationService csiApplicationService
-  )
-    : base(jsonSerializerSettings)
-  {
-    _speckleApplication = speckleApplication;
-    _logger = logger;
-    _csiApplicationService = csiApplicationService;
-    SetPaths();
-    LoadState();
-  }
-
-  private void SetPaths()
-  {
-    ModelPathHash = Crypt.Md5(_csiApplicationService.SapModel.GetModelFilepath(), length: 32);
-    HostAppUserDataPath = Path.Combine(
-      SpecklePathProvider.UserSpeckleFolderPath,
-      "ConnectorsFileData",
-      _speckleApplication.Slug
-    );
-    DocumentStateFile = Path.Combine(HostAppUserDataPath, $"{ModelPathHash}.json");
-  }
-
-  protected override void HostAppSaveState(string modelCardState)
-  {
-    try
-    {
-      if (!Directory.Exists(HostAppUserDataPath))
-      {
-        Directory.CreateDirectory(HostAppUserDataPath);
-      }
-      File.WriteAllText(DocumentStateFile, modelCardState);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogError(ex.Message);
-    }
-  }
-
-  protected override void LoadState()
-  {
-    if (!Directory.Exists(HostAppUserDataPath))
-    {
-      ClearAndSave();
-      return;
-    }
-
-    if (!File.Exists(DocumentStateFile))
-    {
-      ClearAndSave();
-      return;
-    }
-
-    string serializedState = File.ReadAllText(DocumentStateFile);
-    LoadFromString(serializedState);
-  }
-}
@@ -1,20 +0,0 @@
-using Speckle.Connectors.DUI.Bridge;
-
-namespace Speckle.Connectors.CSiShared.HostApp;
-
-public sealed class CsiIdleManager : AppIdleManager
-{
-  private readonly IIdleCallManager _idleCallManager;
-
-  public CsiIdleManager(IIdleCallManager idleCallManager)
-    : base(idleCallManager)
-  {
-    _idleCallManager = idleCallManager;
-  }
-
-  protected override void AddEvent()
-  {
-    // TODO: CSi specific idle handling can be added here if needed
-    _idleCallManager.AppOnIdle(() => { });
-  }
-}
@@ -1,43 +0,0 @@
-using Speckle.Converters.Common;
-using Speckle.Converters.CSiShared;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.CSiShared.HostApp;
-
-/// <summary>
-/// We can use the CSiWrappers to create our collection structure.
-/// </summary>
-/// <remarks>
-/// This class manages the collections. If the key (from the path) already exists, this collection is returned.
-/// If it doesn't exist, a new collection is created and added to the rootObject.
-/// </remarks>
-public class CsiSendCollectionManager
-{
-  protected IConverterSettingsStore<CsiConversionSettings> ConverterSettings { get; }
-  protected Dictionary<string, Collection> CollectionCache { get; } = new();
-
-  public CsiSendCollectionManager(IConverterSettingsStore<CsiConversionSettings> converterSettings)
-  {
-    ConverterSettings = converterSettings;
-  }
-
-  public virtual Collection AddObjectCollectionToRoot(Base convertedObject, Collection rootObject)
-  {
-    var path = GetCollectionPath(convertedObject);
-
-    if (CollectionCache.TryGetValue(path, out Collection? collection))
-    {
-      return collection;
-    }
-
-    Collection childCollection = CreateCollection(convertedObject);
-    rootObject.elements.Add(childCollection);
-    CollectionCache[path] = childCollection;
-    return childCollection;
-  }
-
-  protected virtual string GetCollectionPath(Base convertedObject) => convertedObject["type"]?.ToString() ?? "Unknown";
-
-  protected virtual Collection CreateCollection(Base convertedObject) => new(GetCollectionPath(convertedObject));
-}
@@ -1,114 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.CSiShared.HostApp;
-using Speckle.Converters.Common;
-using Speckle.Converters.CSiShared;
-using Speckle.Sdk;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.CSiShared.Builders;
-
-public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
-{
-  private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
-  private readonly ISendConversionCache _sendConversionCache;
-  private readonly IConverterSettingsStore<CsiConversionSettings> _converterSettings;
-  private readonly CsiSendCollectionManager _sendCollectionManager;
-  private readonly ILogger<CsiRootObjectBuilder> _logger;
-  private readonly ISdkActivityFactory _activityFactory;
-  private readonly ICsiApplicationService _csiApplicationService;
-
-  public CsiRootObjectBuilder(
-    IRootToSpeckleConverter rootToSpeckleConverter,
-    ISendConversionCache sendConversionCache,
-    IConverterSettingsStore<CsiConversionSettings> converterSettings,
-    CsiSendCollectionManager sendCollectionManager,
-    ILogger<CsiRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory,
-    ICsiApplicationService csiApplicationService
-  )
-  {
-    _sendConversionCache = sendConversionCache;
-    _converterSettings = converterSettings;
-    _sendCollectionManager = sendCollectionManager;
-    _rootToSpeckleConverter = rootToSpeckleConverter;
-    _logger = logger;
-    _activityFactory = activityFactory;
-    _csiApplicationService = csiApplicationService;
-  }
-
-  public async Task<RootObjectBuilderResult> Build(
-    IReadOnlyList<ICsiWrapper> csiObjects,
-    SendInfo sendInfo,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken = default
-  )
-  {
-    using var activity = _activityFactory.Start("Build");
-
-    string modelFileName = _csiApplicationService.SapModel.GetModelFilename(false) ?? "Unnamed model";
-    Collection rootObjectCollection = new() { name = modelFileName };
-    rootObjectCollection["units"] = _converterSettings.Current.SpeckleUnits;
-
-    List<SendConversionResult> results = new(csiObjects.Count);
-    int count = 0;
-
-    using (var _ = _activityFactory.Start("Convert all"))
-    {
-      foreach (ICsiWrapper csiObject in csiObjects)
-      {
-        using var _2 = _activityFactory.Start("Convert");
-        cancellationToken.ThrowIfCancellationRequested();
-
-        var result = ConvertCSiObject(csiObject, rootObjectCollection, sendInfo.ProjectId);
-        results.Add(result);
-
-        count++;
-        onOperationProgressed.Report(new("Converting", (double)count / csiObjects.Count));
-      }
-    }
-
-    if (results.All(x => x.Status == Status.ERROR))
-    {
-      throw new SpeckleException("Failed to convert all objects.");
-    }
-
-    await Task.Yield();
-    return new RootObjectBuilderResult(rootObjectCollection, results);
-  }
-
-  private SendConversionResult ConvertCSiObject(ICsiWrapper csiObject, Collection typeCollection, string projectId)
-  {
-    string applicationId = $"{csiObject.ObjectType}{csiObject.Name}"; // TODO: NO! Use GUID
-    string sourceType = csiObject.ObjectName;
-
-    try
-    {
-      Base converted;
-      if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
-      {
-        converted = value;
-      }
-      else
-      {
-        converted = _rootToSpeckleConverter.Convert(csiObject);
-      }
-
-      var collection = _sendCollectionManager.AddObjectCollectionToRoot(converted, typeCollection);
-      collection.elements ??= new List<Base>();
-      collection.elements.Add(converted);
-
-      return new(Status.SUCCESS, applicationId, sourceType, converted);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogError(ex, sourceType);
-      return new(Status.ERROR, applicationId, sourceType, null, ex);
-    }
-  }
-}
@@ -1,57 +0,0 @@
-namespace Speckle.Connectors.CSiShared;
-
-[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-public abstract class CSiPluginBase : cPluginContract, IDisposable
-{
-  private const string s_modality = "Non-Modal";
-  private SpeckleFormBase? _panel;
-  private bool _disposed;
-
-  public void Main(ref cSapModel sapModel, ref cPluginCallback pluginCallback)
-  {
-    _panel = CreateForm();
-    _panel.SetSapModel(ref sapModel, ref pluginCallback);
-    _panel.FormClosed += (s, e) => Dispose();
-
-    if (string.Equals(s_modality, "Non-Modal", StringComparison.OrdinalIgnoreCase))
-    {
-      _panel.Show();
-    }
-    else
-    {
-      _panel.ShowDialog();
-    }
-  }
-
-  protected abstract SpeckleFormBase CreateForm();
-
-  public virtual int Info(ref string text)
-  {
-    text = "Hey Speckler! This is our next-gen CSi Connector.";
-    return 0;
-  }
-
-  protected virtual void Dispose(bool disposing)
-  {
-    if (!_disposed)
-    {
-      if (disposing)
-      {
-        _panel?.Dispose();
-        _panel = null;
-      }
-      _disposed = true;
-    }
-  }
-
-  public void Dispose()
-  {
-    Dispose(true);
-    GC.SuppressFinalize(this);
-  }
-
-  ~CSiPluginBase()
-  {
-    Dispose(false);
-  }
-}
@@ -1,65 +0,0 @@
-using System.ComponentModel;
-using System.Windows.Forms.Integration;
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Common;
-using Speckle.Connectors.CSiShared.HostApp;
-using Speckle.Connectors.DUI.WebView;
-using Speckle.Converters.CSiShared;
-using Speckle.Sdk.Host;
-
-namespace Speckle.Connectors.CSiShared;
-
-[DesignerCategory("")]
-public abstract class SpeckleFormBase : Form
-{
-  protected ElementHost Host { get; set; }
-  public static new ServiceProvider? Container { get; set; }
-  private cSapModel _sapModel;
-  private cPluginCallback _pluginCallback;
-
-  protected SpeckleFormBase()
-  {
-    Text = "Speckle (Beta)";
-
-    var services = new ServiceCollection();
-    ConfigureServices(services);
-
-    Container = services.BuildServiceProvider();
-
-    var webview = Container.GetRequiredService<DUI3ControlWebView>();
-    Host = new() { Child = webview, Dock = DockStyle.Fill };
-    Controls.Add(Host);
-    FormClosing += Form1Closing;
-  }
-
-  protected virtual void ConfigureServices(IServiceCollection services)
-  {
-    services.Initialize(GetHostApplication(), GetVersion());
-    services.AddCsi();
-    services.AddCsiConverters();
-  }
-
-  protected abstract HostApplication GetHostApplication();
-
-  protected abstract HostAppVersion GetVersion();
-
-  public void SetSapModel(ref cSapModel sapModel, ref cPluginCallback pluginCallback)
-  {
-    _sapModel = sapModel;
-    _pluginCallback = pluginCallback;
-
-    var csiService = Container.GetRequiredService<ICsiApplicationService>();
-    csiService.Initialize(sapModel, pluginCallback);
-  }
-
-  protected void Form1Closing(object? sender, FormClosingEventArgs e)
-  {
-    Host.Dispose();
-    _pluginCallback.Finish(0);
-  }
-
-  public new void ShowDialog()
-  {
-    base.ShowDialog();
-  }
-}
@@ -1,52 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Common;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.CSiShared.Bindings;
-using Speckle.Connectors.CSiShared.Builders;
-using Speckle.Connectors.CSiShared.Filters;
-using Speckle.Connectors.CSiShared.HostApp;
-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;
-using Speckle.Converters.CSiShared;
-
-namespace Speckle.Connectors.CSiShared;
-
-public static class ServiceRegistration
-{
-  public static IServiceCollection AddCsi(this IServiceCollection services)
-  {
-    services.AddSingleton<IBrowserBridge, BrowserBridge>();
-    services.AddSingleton<ICsiApplicationService, CsiApplicationService>();
-
-    services.AddConnectorUtils();
-    services.AddDUI<CsiDocumentModelStore>();
-    services.AddDUIView();
-
-    services.AddSingleton<DocumentModelStore, CsiDocumentModelStore>();
-
-    services.AddSingleton<IBinding, TestBinding>();
-    services.AddSingleton<IBinding, ConfigBinding>();
-    services.AddSingleton<IBinding, AccountBinding>();
-
-    services.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
-    services.AddSingleton<IBasicConnectorBinding, CsiSharedBasicConnectorBinding>();
-    services.AddSingleton<IAppIdleManager, CsiIdleManager>();
-
-    services.AddSingleton<IBinding, CsiSharedSelectionBinding>();
-    services.AddSingleton<IBinding, CsiSharedSendBinding>();
-
-    services.AddScoped<ISendFilter, CsiSharedSelectionFilter>();
-    services.AddScoped<CsiSendCollectionManager>();
-    services.AddScoped<IRootObjectBuilder<ICsiWrapper>, CsiRootObjectBuilder>();
-    services.AddScoped<SendOperation<ICsiWrapper>>();
-
-    services.RegisterTopLevelExceptionHandler();
-
-    return services;
-  }
-}
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>a8e949b8-aa55-4909-99f0-8b551791a1f8</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Speckle.Connectors.CSiShared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\CsiSharedBasicConnectorBinding.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\CsiSharedSelectionBinding.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\CsiSharedSendBinding.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Filters\CsiSharedSelectionFilter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiSendCollectionManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\CsiRootObjectBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\CsiPluginBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\SpeckleFormBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)GlobalUsing.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiApplicationService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiDocumentModelStore.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiIdleManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ServiceRegistration.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\ObjectIdentifiers.cs" />
-  </ItemGroup>
-</Project>
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a8e949b8-aa55-4909-99f0-8b551791a1f8</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </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" />
-  <PropertyGroup />
-  
-  <Import Project="Speckle.Connectors.CSiShared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
@@ -1,35 +0,0 @@
-namespace Speckle.Connectors.CSiShared.Utils;
-
-/// <summary>
-/// ObjectIdentifier based on concatenating the objectType and objectName. CSi is annoying, we can't use GUIDs.
-/// </summary>
-/// <remarks>
-/// All API methods are based on the objectType and objectName, not the GUID.
-/// We will obviously manage the GUIDs but for all method calls we need a concatenated version of the objectType and objectName.
-/// Since objectType is a single int (1, 2 ... 7) we know first index will always be the objectType.
-/// This int gets used by the CsiWrapperFactory to create the CSiWrappers.
-/// </remarks>
-public static class ObjectIdentifier
-{
-  public static string Encode(int objectType, string objectName)
-  {
-    if (objectType < 1 || objectType > 7) // Both ETABS and SAP2000 APIs have the same returns for objectType
-    {
-      throw new ArgumentException($"Invalid object type: {objectType}. Must be between 1 and 7.");
-    }
-    return $"{objectType}{objectName}";
-  }
-
-  public static (int type, string name) Decode(string encodedId)
-  {
-    if (string.IsNullOrEmpty(encodedId) || encodedId.Length < 2) // Superfluous. But rather safe than sorry
-    {
-      throw new ArgumentException($"Invalid encoded ID: {encodedId}");
-    }
-
-    int objectType = int.Parse(encodedId[0].ToString());
-    string objectName = encodedId[1..];
-
-    return (objectType, objectName);
-  }
-}
@@ -1,12 +0,0 @@
-using Speckle.Connectors.ETABSShared;
-using Speckle.Sdk.Host;
-
-// NOTE: Plugin entry point must match the assembly name, otherwise ETABS hits you with a "Not found" error when loading plugin
-// Disabling error below to prioritize DUI3 project structure. Name of cPlugin class cannot be changed
-#pragma warning disable IDE0130
-namespace Speckle.Connectors.ETABS21;
-
-public class SpeckleForm : EtabsSpeckleFormBase
-{
-  protected override HostAppVersion GetVersion() => HostAppVersion.v2021; // TODO: We need a v21
-}
@@ -1,12 +0,0 @@
-using Speckle.Connectors.ETABSShared;
-
-// NOTE: Plugin entry point must match the assembly name, otherwise ETABS hits you with a "Not found" error when loading plugin
-// Disabling error below to prioritize DUI3 project structure. Name of cPlugin class cannot be changed
-#pragma warning disable IDE0130
-namespace Speckle.Connectors.ETABS21;
-
-[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-public class cPlugin : EtabsPluginBase
-{
-  protected override EtabsSpeckleFormBase CreateEtabsForm() => new SpeckleForm();
-}
@@ -1,8 +0,0 @@
-{
-  "profiles": {
-    "ETABS 21": {
-      "commandName": "Executable",
-      "executablePath": "C:\\Program Files\\Computers and Structures\\ETABS 21\\ETABS.exe"
-    }
-  }
-}
@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-      <TargetFramework>net48</TargetFramework>
-      <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
-      <Platforms>AnyCPU</Platforms>
-      <UseWindowsForms>true</UseWindowsForms>
-      <UseWPF>true</UseWPF>
-      <ETABSVersion>21</ETABSVersion>
-      <DefineConstants>$(DefineConstants);ETABS21</DefineConstants>
-      <EnableDynamicLoading>true</EnableDynamicLoading>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS21\Speckle.Converters.ETABS21.csproj" />
-      <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-      <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
-
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Speckle.CSI.API" PrivateAssets="all" IncludeAssets="compile; build" VersionOverride="1.30.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Update="Plugin\SpeckleForm.cs" />
-    </ItemGroup>
-
-    <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />
-
-    <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
-
-</Project>
@@ -1,378 +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.CSI.API": {
-        "type": "Direct",
-        "requested": "[1.30.0, )",
-        "resolved": "1.30.0",
-        "contentHash": "4S5Udr+YDU43YgB+TXgnPtGioRj1hDnucHlr42ikr72h1yQwzmkC2HwWJibjZD+sOrAke67q1N8geIqJj9Ss4Q=="
-      },
-      "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.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "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.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
-        "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=="
-      },
-      "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.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
-        }
-      },
-      "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.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
-          "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.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )"
-        }
-      },
-      "speckle.converters.etabs21": {
-        "type": "Project",
-        "dependencies": {
-          "Speckle.Converters.Common": "[1.0.0, )"
-        }
-      },
-      "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.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
-        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
-      "System.Threading.Tasks.Dataflow": {
-        "type": "CentralTransitive",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA=="
-      }
-    }
-  }
-}
@@ -1,12 +0,0 @@
-using Speckle.Connectors.ETABSShared;
-using Speckle.Sdk.Host;
-
-// NOTE: Plugin entry point must match the assembly name, otherwise ETABS hits you with a "Not found" error when loading plugin
-// Disabling error below to prioritize DUI3 project structure. Name of cPlugin class cannot be changed
-#pragma warning disable IDE0130
-namespace Speckle.Connectors.ETABS22;
-
-public class SpeckleForm : EtabsSpeckleFormBase
-{
-  protected override HostAppVersion GetVersion() => HostAppVersion.v2021; // TODO: v22
-}
@@ -1,12 +0,0 @@
-using Speckle.Connectors.ETABSShared;
-
-// NOTE: Plugin entry point must match the assembly name, otherwise ETABS hits you with a "Not found" error when loading plugin
-// Disabling error below to prioritize DUI3 project structure. Name of cPlugin class cannot be changed
-#pragma warning disable IDE0130
-namespace Speckle.Connectors.ETABS22;
-
-[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-public class cPlugin : EtabsPluginBase
-{
-  protected override EtabsSpeckleFormBase CreateEtabsForm() => new SpeckleForm();
-}
@@ -1,8 +0,0 @@
-{
-  "profiles": {
-    "ETABS 22": {
-      "commandName": "Executable",
-      "executablePath": "C:\\Program Files\\Computers and Structures\\ETABS 22\\ETABS.exe"
-    }
-  }
-}
@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-      <TargetFramework>net8.0-windows</TargetFramework>
-      <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
-      <Platforms>AnyCPU</Platforms>
-      <UseWindowsForms>true</UseWindowsForms>
-      <UseWPF>true</UseWPF>
-      <ETABSVersion>22</ETABSVersion>
-      <DefineConstants>$(DefineConstants);ETABS22;ETABS22_OR_GREATER</DefineConstants>
-      <EnableDynamicLoading>true</EnableDynamicLoading>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS22\Speckle.Converters.ETABS22.csproj" />
-      <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-      <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Speckle.CSI.API" PrivateAssets="all" IncludeAssets="compile; build" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Update="Plugin\SpeckleForm.cs" />
-    </ItemGroup>
-
-    <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />
-
-    <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
-
-</Project>
@@ -1,333 +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.CSI.API": {
-        "type": "Direct",
-        "requested": "[2.4.0, )",
-        "resolved": "2.4.0",
-        "contentHash": "/n3qIBeamiYlWm77/2+dDPYExm/MoDEtnu5IPB2G9Dei06wMgkdBefaSDKWnh3u4iuyha6TvrBZgVGosUylRDg=="
-      },
-      "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.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
-        "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=="
-      },
-      "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.219, )",
-          "Speckle.Sdk": "[3.1.0-dev.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )"
-        }
-      },
-      "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.219, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.219, )",
-          "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.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.219, )"
-        }
-      },
-      "speckle.converters.etabs22": {
-        "type": "Project",
-        "dependencies": {
-          "Speckle.Converters.Common": "[1.0.0, )"
-        }
-      },
-      "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.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "2thsMUDkRr7lR0PXZJ8k3KWZLWjz/aBY0KaO2SuXM0lIKyJw1APMJ7lXJ89e6JAjBzEbK8yLHBb0qtfcc4bNRw==",
-        "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "UTgz9UgkMFGqRLmCq1HPo74MngvKbSZOFWaMRzASHrrnsBtzZatBXjoJBlvVoeBCoiea5Jj+BgZg6RvlV2m3sg==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.219"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.219, )",
-        "resolved": "3.1.0-dev.219",
-        "contentHash": "5hqBd9whAs5cC8S/6YUgKFOivjntAkVutKhz06XD/f3Kj6xScT3hwcUaWBxiwK3Mw7FLtiVuU1uG777pjn0PKQ=="
-      },
-      "System.Threading.Tasks.Dataflow": {
-        "type": "CentralTransitive",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA=="
-      }
-    }
-  }
-}
@@ -1,153 +0,0 @@
-using Speckle.Connectors.CSiShared.HostApp;
-using Speckle.Converters.Common;
-using Speckle.Converters.CSiShared;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.ETABSShared.HostApp;
-
-/// <summary>
-/// ETABS-specific collection manager that organizes structural elements by level and type.
-/// Creates a hierarchical structure that mirrors ETABS' native organization.
-/// </summary>
-public class EtabsSendCollectionManager : CsiSendCollectionManager
-{
-  private const string DEFAULT_LEVEL = "Unassigned";
-
-  private readonly Dictionary<ElementCategory, string> _categoryNames =
-    new()
-    {
-      { ElementCategory.COLUMN, "Columns" },
-      { ElementCategory.BEAM, "Beams" },
-      { ElementCategory.BRACE, "Braces" },
-      { ElementCategory.WALL, "Walls" },
-      { ElementCategory.FLOOR, "Floors" },
-      { ElementCategory.RAMP, "Ramps" },
-      { ElementCategory.JOINT, "Joints" },
-      { ElementCategory.OTHER, "Other" }
-    };
-
-  public EtabsSendCollectionManager(IConverterSettingsStore<CsiConversionSettings> converterSettings)
-    : base(converterSettings) { }
-
-  public override Collection AddObjectCollectionToRoot(Base convertedObject, Collection rootObject)
-  {
-    var level = GetObjectLevelFromObject(convertedObject);
-    var category = GetElementCategoryFromObject(convertedObject);
-
-    return GetOrCreateCollectionHierarchy(level, category, rootObject);
-  }
-
-  private string GetObjectLevelFromObject(Base obj)
-  {
-    // Properties from converter are stored in "Object ID" dictionary
-    // NOTE: Introduce enums for these object keys? I don't like string indexing.
-    if (obj["properties"] is not Dictionary<string, object> properties)
-    {
-      return DEFAULT_LEVEL;
-    }
-
-    if (properties.TryGetValue("Object ID", out var objectId) && objectId is Dictionary<string, object> parameters)
-    {
-      return parameters.TryGetValue("level", out var level) ? level?.ToString() ?? DEFAULT_LEVEL : DEFAULT_LEVEL;
-    }
-
-    return DEFAULT_LEVEL;
-  }
-
-  private ElementCategory GetElementCategoryFromObject(Base obj)
-  {
-    var type = obj["type"]?.ToString();
-
-    // Handle non-structural elements
-    if (string.IsNullOrEmpty(type))
-    {
-      return ElementCategory.OTHER;
-    }
-
-    // For frames and shells, get design orientation from Object ID
-    if ((type == "Frame" || type == "Shell") && obj["properties"] is Dictionary<string, object> properties)
-    {
-      if (properties.TryGetValue("Object ID", out var objectId) && objectId is Dictionary<string, object> parameters)
-      {
-        if (parameters.TryGetValue("designOrientation", out var orientation))
-        {
-          return GetCategoryFromDesignOrientation(orientation?.ToString(), type);
-        }
-      }
-    }
-
-    // For joints, simply categorize as joints
-    return type == "Joint" ? ElementCategory.JOINT : ElementCategory.OTHER;
-  }
-
-  private ElementCategory GetCategoryFromDesignOrientation(string? orientation, string type)
-  {
-    if (string.IsNullOrEmpty(orientation))
-    {
-      return ElementCategory.OTHER;
-    }
-
-    return (orientation, type) switch
-    {
-      ("Column", "Frame") => ElementCategory.COLUMN,
-      ("Beam", "Frame") => ElementCategory.BEAM,
-      ("Brace", "Frame") => ElementCategory.BRACE,
-      ("Wall", "Shell") => ElementCategory.WALL,
-      ("Floor", "Shell") => ElementCategory.FLOOR,
-      ("Ramp", "Shell") => ElementCategory.RAMP,
-      _ => ElementCategory.OTHER
-    };
-  }
-
-  private Collection GetOrCreateCollectionHierarchy(string level, ElementCategory category, Collection root)
-  {
-    var hierarchyKey = $"{level}_{category}";
-
-    if (CollectionCache.TryGetValue(hierarchyKey, out var existingCollection))
-    {
-      return existingCollection;
-    }
-
-    var levelCollection = GetOrCreateLevelCollection(level, root);
-    var categoryCollection = CreateCategoryCollection(category, levelCollection);
-
-    CollectionCache[hierarchyKey] = categoryCollection;
-    return categoryCollection;
-  }
-
-  private Collection GetOrCreateLevelCollection(string level, Collection root)
-  {
-    var levelKey = $"Level_{level}";
-
-    if (CollectionCache.TryGetValue(levelKey, out var existingCollection))
-    {
-      return existingCollection;
-    }
-
-    var levelCollection = new Collection(level);
-    root.elements.Add(levelCollection);
-    CollectionCache[levelKey] = levelCollection;
-
-    return levelCollection;
-  }
-
-  private Collection CreateCategoryCollection(ElementCategory category, Collection levelCollection)
-  {
-    var categoryCollection = new Collection(_categoryNames[category]);
-    levelCollection.elements.Add(categoryCollection);
-    return categoryCollection;
-  }
-
-  private enum ElementCategory
-  {
-    COLUMN,
-    BEAM,
-    BRACE,
-    WALL,
-    FLOOR,
-    RAMP,
-    JOINT,
-    OTHER
-  }
-}
@@ -1,17 +0,0 @@
-using Speckle.Connectors.CSiShared;
-
-namespace Speckle.Connectors.ETABSShared;
-
-[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-public abstract class EtabsPluginBase : CSiPluginBase
-{
-  public override int Info(ref string text)
-  {
-    text = "Hey Speckler! This is our next-gen ETABS Connector.";
-    return 0;
-  }
-
-  protected override SpeckleFormBase CreateForm() => CreateEtabsForm();
-
-  protected abstract EtabsSpeckleFormBase CreateEtabsForm();
-}
@@ -1,16 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.CSiShared;
-using Speckle.Sdk.Host;
-
-namespace Speckle.Connectors.ETABSShared;
-
-public abstract class EtabsSpeckleFormBase : SpeckleFormBase
-{
-  protected override HostApplication GetHostApplication() => HostApplications.ETABS;
-
-  protected override void ConfigureServices(IServiceCollection services)
-  {
-    base.ConfigureServices(services);
-    services.AddEtabs();
-  }
-}
@@ -1,17 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.CSiShared.HostApp;
-using Speckle.Connectors.ETABSShared.HostApp;
-using Speckle.Converters.ETABSShared;
-
-namespace Speckle.Connectors.ETABSShared;
-
-public static class ServiceRegistration
-{
-  public static IServiceCollection AddEtabs(this IServiceCollection services)
-  {
-    services.AddEtabsConverters();
-    services.AddScoped<CsiSendCollectionManager, EtabsSendCollectionManager>();
-
-    return services;
-  }
-}
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>5d1e0b0d-56a7-4e13-b9a9-8633e02b8f17</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Speckle.Connectors.ETABSShared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\EtabsSendCollectionManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\EtabsPluginBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\EtabsSpeckleFormBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ServiceRegistration.cs" />
-  </ItemGroup>
-</Project>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>5d1e0b0d-56a7-4e13-b9a9-8633e02b8f17</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </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" />
-  <PropertyGroup />
-  <Import Project="Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
@@ -1,9 +0,0 @@
-{
-  "profiles": {
-    "Speckle.Connector.Navisworks2020": {
-      "commandName": "Executable",
-      "executablePath": "C:\\Program Files\\Autodesk\\Navisworks Manage 2020\\Roamer.exe",
-      "commandLineArgs": " -licensing AdLM"
-    }
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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