diff --git a/.circleci/scripts/config-template.yml b/.circleci/scripts/config-template.yml
index 734bcb98c7..40a802e927 100644
--- a/.circleci/scripts/config-template.yml
+++ b/.circleci/scripts/config-template.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  win: circleci/windows@5
+  win: circleci/windows@5.0.0
   aws-s3: circleci/aws-s3@2.0.0
   codecov: codecov/codecov@3.2.2
   wait-for: cobli/wait-for@0.0.2
@@ -15,7 +15,7 @@ commands:
       - run:
           name: Publish nuget package
           command: |
-            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.$($env:WORFKLOW_NUM)-beta/a" } else { $env:CIRCLE_TAG }
+            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "2.0.999.$($env:WORKFLOW_NUM)" } else { $env:CIRCLE_TAG }
             $version = $tag.Split("/")[1]  
             msbuild <<parameters.projectfilepath>> /p:Version="$version" /p:Configuration=Release /p:WarningLevel=0 /p:IsDesktopBuild=false -t:pack
             dotnet nuget push **/*.nupkg -s https://api.nuget.org/v3/index.json -k $env:NUGET_APIKEY -n true
@@ -29,7 +29,7 @@ commands:
       - run:
           name: Publish nuget package
           command: |
-            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999.$WORKFLOW_NUM"; fi;)
             SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]+//')
             VERSION=$(echo "$SEMVER" | sed -e 's/[a-zA-Z]*\///')
             msbuild <<parameters.projectfilepath>> /p:Version="$VERSION" /p:Configuration=Release /p:WarningLevel=0 /p:IsDesktopBuild=false -t:pack
@@ -49,8 +49,8 @@ jobs: # Each project will have individual jobs for each specific task it has to
 
   test-core:
     docker:
-      - image: "mcr.microsoft.com/dotnet/core/sdk" # dotnet core 3.1 sdk
-      - image: "mcr.microsoft.com/dotnet/core/sdk:2.1-focal" # dotnet core 2.1 sdk (for netstandard support on build)
+      - image: "mcr.microsoft.com/dotnet/sdk:6.0" # dotnet
+      # - image: "mcr.microsoft.com/dotnet/core/sdk:2.1-focal" # dotnet core 2.1 sdk (for netstandard support on build)
       # Node, redis, postgres and speckle-server images for test server
       - image: "cimg/node:16.15"
       - image: "cimg/redis:6.2"
@@ -154,7 +154,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
       - run:
           name: Build << parameters.slnname >>
           command: |
-            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.0" } else { $env:CIRCLE_TAG }
+            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "2.0.999" } else { $env:CIRCLE_TAG }
             $semver = if($tag.Contains('/')) {$tag.Split("/")[0] } else { $tag }
             $ver = if($semver.Contains('-')) {$semver.Split("-")[0] } else { $semver }
             $version = "$($ver).$($env:WORKFLOW_NUM)"
@@ -207,9 +207,11 @@ jobs: # Each project will have individual jobs for each specific task it has to
       - run:
           name: Upload new version
           command: |
-            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999.$WORKFLOW_NUM"; fi;)
             SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
             /root/.dotnet/tools/Speckle.Manager.Feed deploy -s << parameters.slug >> -v ${SEMVER} -u https://releases.speckle.dev/installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >> -o << parameters.os >> -a << parameters.arch >> -f speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >>
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
 
   build-connector-mac:
     macos:
@@ -265,7 +267,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
       - run:
           name: Set environment variables
           command: |
-            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
             SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
             VER=$(echo "$SEMVER" | sed -e 's/-beta//')
             VERSION=$(echo $VER.$WORKFLOW_NUM)
@@ -279,7 +281,9 @@ jobs: # Each project will have individual jobs for each specific task it has to
             - run:
                 name: Build << parameters.slnname >>
                 command: |
-                  msbuild << parameters.slnname >>/<< parameters.slnname >>.sln /r /p:Configuration='<< parameters.build-config >>' /p:WarningLevel=0 /p:IsDesktopBuild=false
+                  TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
+                  SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+                  msbuild << parameters.slnname >>/<< parameters.slnname >>.sln /r /p:Configuration='<< parameters.build-config >>' /p:WarningLevel=0 /p:IsDesktopBuild=false /p:Version=$SEMVER
             # Compress build files
             - run:
                 name: Zip Objects Kit files
@@ -303,9 +307,11 @@ jobs: # Each project will have individual jobs for each specific task it has to
             - run:
                 name: Publish x64 and arm64
                 command: |
-                  TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.0"; fi;)
+                  TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999.$WORKFLOW_NUM"; fi;)
                   SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
                   $HOME/.dotnet/dotnet publish << parameters.slnname >>/<< parameters.slnname >>/<< parameters.projname >>.csproj -c Release -v q -r osx-x64 --self-contained /p:WarningLevel=0 /p:Version=$SEMVER
+                environment:
+                  WORKFLOW_NUM: << pipeline.number >>
             #      $HOME/.dotnet/dotnet msbuild << parameters.slnname >>/<< parameters.slnname >>/<< parameters.projname >>.csproj -t:BundleApp -p:Configuration=Release -p:RuntimeIdentifier=osx-x64 -p:SelfContained=true /p:WarningLevel=0 -p:Version=$TAG
             #      $HOME/.dotnet/dotnet publish << parameters.slnname >>/<< parameters.slnname >>/<< parameters.projname >>.csproj -c Release -v q -r osx-arm64 --self-contained /p:WarningLevel=0 /p:Version=$TAG
             #      $HOME/.dotnet/dotnet msbuild << parameters.slnname >>/<< parameters.slnname >>/<< parameters.projname >>.csproj -t:BundleApp -p:Configuration=Release -p:RuntimeIdentifier=osx-arm64 -p:SelfContained=true /p:WarningLevel=0 -p:Version=$TAG
@@ -342,9 +348,11 @@ jobs: # Each project will have individual jobs for each specific task it has to
       - run:
           name: Copy to installer location
           command: |
-            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999.$WORKFLOW_NUM"; fi;)
             SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
             cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/netcoreapp3.1/osx-x64/<<parameters.slug>>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<<parameters.slug>>-$SEMVER.zip
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
       - when:
           condition: << pipeline.git.tag >>
           steps:
@@ -397,7 +405,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
             cd ConnectorArchicad/AddOn
             mkdir Build.Win.x64.<<parameters.archicadversion>>
             export PATH=$PATH:"C:\Program Files\CMake\bin"
-            cmake -B "./Build.Win.x64.<<parameters.archicadversion>>/" -DAC_API_DEVKIT_DIR="../../Resources/Archicad<<parameters.archicadversion>>DevKit" -DAC_MDID_DEV=$GRAPHISOFT_DEV_ID -DAC_MDID_LOC=$GRAPHISOFT_ADDON_ID
+            cmake -B "./Build.Win.x64.<<parameters.archicadversion>>/" -A "x64" -T "v142" -DAC_API_DEVKIT_DIR="../../Resources/Archicad<<parameters.archicadversion>>DevKit" -DAC_MDID_DEV=$GRAPHISOFT_DEV_ID -DAC_MDID_LOC=$GRAPHISOFT_ADDON_ID
       - run:
           name: Build add-on
           command: |
diff --git a/.gitignore b/.gitignore
index 90b24e1de0..6180455370 100644
--- a/.gitignore
+++ b/.gitignore
@@ -224,6 +224,8 @@ _pkginfo.txt
 !?*.[Cc]ache/
 
 # Others
+Records/
+Sandbox/
 ClientBin/
 ~$*
 *~
diff --git a/All.sln b/All.sln
index 6629563333..7210d940db 100644
--- a/All.sln
+++ b/All.sln
@@ -1,934 +1,940 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32210.238
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Connectors", "Connectors", "{DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dynamo", "Dynamo", "{CB6F8F77-4487-469B-896A-1EEEC4451A04}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDynamo", "ConnectorDynamo\ConnectorDynamo\ConnectorDynamo.csproj", "{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDynamoExtension", "ConnectorDynamo\ConnectorDynamoExtension\ConnectorDynamoExtension.csproj", "{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDynamoFunctions", "ConnectorDynamo\ConnectorDynamoFunctions\ConnectorDynamoFunctions.csproj", "{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorGrasshopper", "ConnectorGrasshopper\ConnectorGrasshopper\ConnectorGrasshopper.csproj", "{109B3382-634B-408A-8A5C-4CD09CB92641}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopUI", "DesktopUI\DesktopUI\DesktopUI.csproj", "{A97C3046-2D55-4C49-AB40-A3C2194B82FA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Objects", "Objects\Objects\Objects.csproj", "{60BE029E-1F31-4473-8B68-A745A43AF179}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core\Core.csproj", "{A2C8730A-B605-483E-914E-61F3ED7954D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiskTransport", "Core\Transports\DiskTransport\DiskTransport.csproj", "{8BBED205-C34E-4226-8757-0B576132D2BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDBTransport", "Core\Transports\MongoDBTransport\MongoDBTransport.csproj", "{8FA5494A-D651-4C80-9B69-EB1808CF64F8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Transports", "Transports", "{DC6BE73D-4D60-4F90-9778-D44151CD6F98}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Objects", "Objects", "{E3916A0F-68D5-4C84-ACAE-41547F75E454}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Converters", "Converters", "{4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Revit", "Revit", "{42A86931-7497-4A34-B2FD-060231CD0A8F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2021", "ConnectorRevit\ConnectorRevit2021\ConnectorRevit2021.csproj", "{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorRevitShared", "ConnectorRevit\ConnectorRevit\ConnectorRevitShared.shproj", "{5FD0D810-03E9-4FD2-93E4-B1B51E5D82C5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterRevit", "ConverterRevit", "{925C0BF6-A0B1-4699-9C4B-078E01D652CC}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterRevitShared", "Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.shproj", "{2DCD648D-DCA5-4D2A-8B14-AD2CB85D24B0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterDynamo", "ConverterDynamo", "{F0DD5C38-083B-43EA-8654-96247028D8AC}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterDynamoShared", "Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.shproj", "{5BAB09DC-B0FC-4004-9FD5-6496A9634071}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit\ConverterDynamoRevit.csproj", "{AACD5D91-99F1-4E69-B23B-E25239E5FB59}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoSandbox", "Objects\Converters\ConverterDynamo\ConverterDynamoSandbox\ConverterDynamoSandbox.csproj", "{3DF12639-78B6-41B3-A046-A675035369BE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutocadCivil", "AutocadCivil", "{890F3257-FCC2-4ED8-9180-22B3641B494C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2021", "ConnectorAutocadCivil\ConnectorAutocad2021\ConnectorAutocad2021.csproj", "{58A88F1A-7489-46D2-949D-2FC3F68C8D84}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorAutocadCivilShared", "ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.shproj", "{B47492D9-2EDA-4016-A930-7FA708C85C3D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2021", "ConnectorAutocadCivil\ConnectorCivil2021\ConnectorCivil2021.csproj", "{AD10C167-937F-4706-9EB5-C99F86C35E8F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterAutocadCivil", "ConverterAutocadCivil", "{BE521908-7944-46F3-98BF-B47D34509934}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2021", "Objects\Converters\ConverterAutocadCivil\ConverterAutocad2021\ConverterAutocad2021.csproj", "{78573ADC-87A5-489F-8134-FB4A435A05F0}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterAutocadCivilShared", "Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.shproj", "{2D0F9F8A-2E89-4780-978A-CD92D6D7B843}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2021", "Objects\Converters\ConverterAutocadCivil\ConverterCivil2021\ConverterCivil2021.csproj", "{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2020", "ConnectorRevit\ConnectorRevit2020\ConnectorRevit2020.csproj", "{8A53B084-20D8-48F6-9591-9D53CFA74130}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2019", "ConnectorRevit\ConnectorRevit2019\ConnectorRevit2019.csproj", "{EF418256-8118-47B4-8386-A945946FB92D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2022", "ConnectorAutocadCivil\ConnectorAutocad2022\ConnectorAutocad2022.csproj", "{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2022", "ConnectorAutocadCivil\ConnectorCivil2022\ConnectorCivil2022.csproj", "{464F2220-D7D9-4D8C-BB3D-B93A1C603469}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2022", "Objects\Converters\ConverterAutocadCivil\ConverterAutocad2022\ConverterAutocad2022.csproj", "{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2022", "Objects\Converters\ConverterAutocadCivil\ConverterCivil2022\ConverterCivil2022.csproj", "{8581B4BB-A8BC-4328-99FE-D18615AF2554}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorGrasshopperUtils", "ConnectorGrasshopper\ConnectorGrasshopperUtils\ConnectorGrasshopperUtils.csproj", "{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterRhino", "ConverterRhino", "{1FD850CA-A8D7-41DC-9316-B315800437E1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRhino6", "Objects\Converters\ConverterRhinoGh\ConverterRhino6\ConverterRhino6.csproj", "{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRhino7", "Objects\Converters\ConverterRhinoGh\ConverterRhino7\ConverterRhino7.csproj", "{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterRhinoGhShared", "Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.shproj", "{B74CB8C1-187B-46A6-B20B-92B8C129F3EE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Grasshopper", "Grasshopper", "{9461B162-AD2F-4F60-BCE4-E72DCEFD4608}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rhino", "Rhino", "{E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorRhino6", "ConnectorRhino\ConnectorRhino6\ConnectorRhino6.csproj", "{D648BB69-B992-4D34-906E-7A547374B86C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorRhino7", "ConnectorRhino\ConnectorRhino7\ConnectorRhino7.csproj", "{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorRhinoShared", "ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.shproj", "{B7376EC8-5D3E-47D2-96A7-748552F14C39}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolygonMesher", "Objects\Converters\StructuralUtilities\PolygonMesher\PolygonMesher.csproj", "{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StructuralUtilities", "StructuralUtilities", "{85C30B55-E486-49AE-B3F5-6A196D14CCB8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2", "DesktopUI2\DesktopUI2\DesktopUI2.csproj", "{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicroStation", "MicroStation", "{0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorMicroStation", "ConnectorMicroStation\ConnectorMicroStation\ConnectorMicroStation.csproj", "{0420D74A-2997-4B92-844B-C3769DEAA1AD}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorMicroStationOpenShared", "ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.shproj", "{372D9F0F-EDE9-4050-BF8C-758911C5C2E0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorOpenBuildings", "ConnectorMicroStation\ConnectorOpenBuildings\ConnectorOpenBuildings.csproj", "{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorOpenRail", "ConnectorMicroStation\ConnectorOpenRail\ConnectorOpenRail.csproj", "{FC044D89-0FF3-441D-B35D-87454A693C16}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorOpenRoads", "ConnectorMicroStation\ConnectorOpenRoads\ConnectorOpenRoads.csproj", "{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterMicroStation", "ConverterMicroStation", "{B9D189AE-B0AE-49BC-A0A5-ACF87C849615}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterMicroStation", "Objects\Converters\ConverterMicroStation\ConverterMicroStation\ConverterMicroStation.csproj", "{BD2287FA-8272-4D14-9A26-889092AEBFE0}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterMicroStationOpenShared", "Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.shproj", "{208B25E4-2D0E-4534-B197-4C5C96CC53CE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterOpenBuildings", "Objects\Converters\ConverterMicroStation\ConverterOpenBuildings\ConverterOpenBuildings.csproj", "{FFBC46F0-1874-42E9-8270-BBF962EF32D1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterOpenRail", "Objects\Converters\ConverterMicroStation\ConverterOpenRail\ConverterOpenRail.csproj", "{C96D609B-B210-401C-8FFC-5D17F324E9E8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterOpenRoads", "Objects\Converters\ConverterMicroStation\ConverterOpenRoads\ConverterOpenRoads.csproj", "{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2021", "Objects\Converters\ConverterRevit\ConverterRevit2021\ConverterRevit2021.csproj", "{D1D0F986-12BE-4FD5-8925-C96B1F86427D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2022", "Objects\Converters\ConverterRevit\ConverterRevit2022\ConverterRevit2022.csproj", "{76937388-BC9E-4083-9D6E-59CC627E3804}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2020", "Objects\Converters\ConverterRevit\ConverterRevit2020\ConverterRevit2020.csproj", "{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2019", "Objects\Converters\ConverterRevit\ConverterRevit2019\ConverterRevit2019.csproj", "{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2022", "ConnectorRevit\ConnectorRevit2022\ConnectorRevit2022.csproj", "{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TeklaStructures", "TeklaStructures", "{18C8730C-0173-4987-9416-46F86EC20541}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorTeklaStructuresShared", "ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.shproj", "{28E2EA7F-FFD1-4E13-9165-0243B5AC82F5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorTeklaStructures2021", "ConnectorTeklaStructures\ConnectorTeklaStructures2021\ConnectorTeklaStructures2021.csproj", "{3AF1EF30-0906-4926-A02C-4E3AD666352A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorTeklaStructures2020", "ConnectorTeklaStructures\ConnectorTeklaStructures2020\ConnectorTeklaStructures2020.csproj", "{67157264-AAA5-46A8-A38B-16254B49B892}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterTeklaStructures", "ConverterTeklaStructures", "{5D988C50-8E85-402A-9020-A4AB0565F0C9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterTeklaStructures2020", "Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructures2020\ConverterTeklaStructures2020.csproj", "{02A24DD8-E0CA-4657-BAA7-B033A4563709}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterTeklaStructures2021", "Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructures2021\ConverterTeklaStructures2021.csproj", "{C1D53822-B11F-4772-996E-1E6D485E0702}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterTeklaStructuresShared", "Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.shproj", "{7FFDAB72-145D-4490-9892-FAC5F1D72B17}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterCSI", "ConverterCSI", "{7E702AF1-3A72-454D-BE04-D2AF4EF1304B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCSIBridge", "Objects\Converters\ConverterCSI\ConverterCSIBridge\ConverterCSIBridge.csproj", "{21223BA5-C6E8-405D-B581-106C4726EDC0}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterCSIShared", "Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.shproj", "{5BBDE14E-50F8-4D6E-8E35-747667AD4A09}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterETABS", "Objects\Converters\ConverterCSI\ConverterETABS\ConverterETABS.csproj", "{D06F557C-452A-4BBE-9B79-A10DB03F3832}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterSAFE", "Objects\Converters\ConverterCSI\ConverterSAFE\ConverterSAFE.csproj", "{442116F3-0F4A-4136-894E-FF5F4295500B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterSAP2000", "Objects\Converters\ConverterCSI\ConverterSAP2000\ConverterSAP2000.csproj", "{907AED7A-719B-4157-8CC9-D21CB26E9243}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSI", "CSI", "{11C013F3-2583-4292-938B-707294DAECE1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCSIBridge", "ConnectorCSI\ConnectorCSIBridge\ConnectorCSIBridge.csproj", "{23BE6E54-96C1-4373-89F3-E18A1C9807FD}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorCSIShared", "ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.shproj", "{61374CD0-E774-4DCD-BFAB-6356B0931283}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorETABS", "ConnectorCSI\ConnectorETABS\ConnectorETABS.csproj", "{81299D15-5788-414D-A962-1A568C251323}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorSAFE", "ConnectorCSI\ConnectorSAFE\ConnectorSAFE.csproj", "{9D188843-8841-4A76-A844-EFBE8E32EE05}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorSAP2000", "ConnectorCSI\ConnectorSAP2000\ConnectorSAP2000.csproj", "{31E0C098-6813-4571-AB96-A245E0FC1C23}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriverCSharp", "ConnectorCSI\DriverCSharp\DriverCSharp.csproj", "{C091E499-597D-4077-B83F-08E069091090}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriverPluginCSharp", "ConnectorCSI\DriverPluginCSharp\DriverPluginCSharp.csproj", "{C59939F6-D383-44E3-A7EF-4E160E3DFB73}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2023", "ConnectorRevit\ConnectorRevit2023\ConnectorRevit2023.csproj", "{586A5A37-93F6-427E-8DF8-C10DB4D6822A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArchiCAD", "ArchiCAD", "{DF1B3505-793C-4073-975B-04C81CC3CDC4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorArchicad", "ConnectorArchicad\ConnectorArchicad\ConnectorArchicad.csproj", "{D163D710-B946-4D50-8833-BD8B9941033A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2023", "ConnectorAutocadCivil\ConnectorAutocad2023\ConnectorAutocad2023.csproj", "{F4BFB155-7BA9-4E46-8240-9C825060C904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2023", "ConnectorAutocadCivil\ConnectorCivil2023\ConnectorCivil2023.csproj", "{2639E37D-80D3-415A-B4D1-20D7F321F27F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DesktopUI", "DesktopUI", "{59764E6A-8366-4AF3-AB0A-BA28BD0318FA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2.Launcher", "DesktopUI2\DesktopUI2.Launcher\DesktopUI2.Launcher.csproj", "{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2.WPF", "DesktopUI2\DesktopUI2.WPF\DesktopUI2.WPF.csproj", "{3D066801-9823-48ED-8FB3-273B53825808}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDxf", "Objects\Converters\ConverterDxf\ConverterDxf\ConverterDxf.csproj", "{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaHwndHost", "DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj", "{050E8BAB-773E-4FE6-BD38-F71CF65FC257}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit2021", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit2021\ConverterDynamoRevit2021.csproj", "{4DBF45EE-3BCE-47F4-B399-963B36A31951}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit2022", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit2022\ConverterDynamoRevit2022.csproj", "{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit2023", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit2023\ConverterDynamoRevit2023.csproj", "{67A463D3-E98B-4B16-B069-D7BBB05386A1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2023", "Objects\Converters\ConverterRevit\ConverterRevit2023\ConverterRevit2023.csproj", "{CC790553-8088-41A9-83CD-B29F7141F408}"
-EndProject
-Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{02a24dd8-e0ca-4657-baa7-b033a4563709}*SharedItemsImports = 5
-		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{0420d74a-2997-4b92-844b-c3769deaa1ad}*SharedItemsImports = 4
-		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{208b25e4-2d0e-4534-b197-4c5c96cc53ce}*SharedItemsImports = 13
-		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{21223ba5-c6e8-405d-b581-106c4726edc0}*SharedItemsImports = 5
-		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4
-		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{2639e37d-80d3-415a-b4d1-20d7f321f27f}*SharedItemsImports = 4
-		Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{26eca1be-f5b2-4a41-9658-46a4a917bfe6}*SharedItemsImports = 5
-		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{27a79aca-7ea8-4406-8bb8-216578cc3ab7}*SharedItemsImports = 4
-		ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{28e2ea7f-ffd1-4e13-9165-0243b5ac82f5}*SharedItemsImports = 13
-		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2d0f9f8a-2e89-4780-978a-cd92d6d7b843}*SharedItemsImports = 13
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13
-		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{31e0c098-6813-4571-ab96-a245e0fc1c23}*SharedItemsImports = 4
-		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{372d9f0f-ede9-4050-bf8c-758911c5c2e0}*SharedItemsImports = 13
-		ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{3af1ef30-0906-4926-a02c-4e3ad666352a}*SharedItemsImports = 4
-		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{3af1ef30-0906-4926-a02c-4e3ad666352a}*SharedItemsImports = 4
-		Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{3cdef4cc-2cfa-4939-8427-3ed00fa9db55}*SharedItemsImports = 5
-		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{3df12639-78b6-41b3-a046-a675035369be}*SharedItemsImports = 5
-		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{442116f3-0f4a-4136-894e-ff5f4295500b}*SharedItemsImports = 5
-		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{464f2220-d7d9-4d8c-bb3d-b93a1c603469}*SharedItemsImports = 4
-		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{4dbf45ee-3bce-47f4-b399-963b36a31951}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{4dbf45ee-3bce-47f4-b399-963b36a31951}*SharedItemsImports = 5
-		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{50bc1552-3e7e-4c77-ac3a-aa7c572dfe09}*SharedItemsImports = 5
-		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{57bf94a8-8f73-4d1a-91d2-b10cc64178b6}*SharedItemsImports = 4
-		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{586a5a37-93f6-427e-8df8-c10db4d6822a}*SharedItemsImports = 4
-		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{58a88f1a-7489-46d2-949d-2fc3f68c8d84}*SharedItemsImports = 4
-		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{5bab09dc-b0fc-4004-9fd5-6496a9634071}*SharedItemsImports = 13
-		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{5bbde14e-50f8-4d6e-8e35-747667ad4a09}*SharedItemsImports = 13
-		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{5fd0d810-03e9-4fd2-93e4-b1b51e5d82c5}*SharedItemsImports = 13
-		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{61374cd0-e774-4dcd-bfab-6356b0931283}*SharedItemsImports = 13
-		ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{67157264-aaa5-46a8-a38b-16254b49b892}*SharedItemsImports = 4
-		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{67157264-aaa5-46a8-a38b-16254b49b892}*SharedItemsImports = 4
-		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{76937388-bc9e-4083-9d6e-59cc627e3804}*SharedItemsImports = 5
-		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{78573adc-87a5-489f-8134-fb4a435a05f0}*SharedItemsImports = 5
-		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{7ffdab72-145d-4490-9892-fac5f1d72b17}*SharedItemsImports = 13
-		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 4
-		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{8581b4bb-a8bc-4328-99fe-d18615af2554}*SharedItemsImports = 5
-		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{8a53b084-20d8-48f6-9591-9d53cfa74130}*SharedItemsImports = 4
-		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{907aed7a-719b-4157-8cc9-d21cb26e9243}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{98136bfc-a71b-48ad-b0d2-8a5a07fd3d6d}*SharedItemsImports = 5
-		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{9d188843-8841-4a76-a844-efbe8e32ee05}*SharedItemsImports = 4
-		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{a3a0ee09-6055-4009-ab8e-13fbc1a403a9}*SharedItemsImports = 4
-		ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{a64acbf9-db82-4839-af99-57ed2e7989f4}*SharedItemsImports = 5
-		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{aaa05c3d-856d-4f22-971e-5e3f066d0eae}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{aaa05c3d-856d-4f22-971e-5e3f066d0eae}*SharedItemsImports = 5
-		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{aacd5d91-99f1-4e69-b23b-e25239e5fb59}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{aacd5d91-99f1-4e69-b23b-e25239e5fb59}*SharedItemsImports = 5
-		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{ad10c167-937f-4706-9eb5-c99f86c35e8f}*SharedItemsImports = 4
-		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{b47492d9-2eda-4016-a930-7fa708c85c3d}*SharedItemsImports = 13
-		ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{b7376ec8-5d3e-47d2-96a7-748552f14c39}*SharedItemsImports = 13
-		Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13
-		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{bd2287fa-8272-4d14-9a26-889092aebfe0}*SharedItemsImports = 5
-		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{c091e499-597d-4077-b83f-08e069091090}*SharedItemsImports = 4
-		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{c1d53822-b11f-4772-996e-1e6d485e0702}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{c21a6553-b4ec-4ec3-b82a-c7a83cffb809}*SharedItemsImports = 5
-		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{c96d609b-b210-401c-8ffc-5d17f324e9e8}*SharedItemsImports = 5
-		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{cc10bbc6-09da-4bbb-ae92-3f6097a022f1}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{cc790553-8088-41a9-83cd-b29f7141f408}*SharedItemsImports = 5
-		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{d06f557c-452a-4bbe-9b79-a10db03f3832}*SharedItemsImports = 5
-		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{d1d0f986-12be-4fd5-8925-c96b1f86427d}*SharedItemsImports = 5
-		ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{d648bb69-b992-4d34-906e-7a547374b86c}*SharedItemsImports = 5
-		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{d9f443b5-c55b-4ad8-9c70-bc3d2be781be}*SharedItemsImports = 5
-		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{dfdfdbb8-018b-4dcb-a012-54227abf53a7}*SharedItemsImports = 4
-		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{ef418256-8118-47b4-8386-a945946fb92d}*SharedItemsImports = 4
-		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4bfb155-7ba9-4e46-8240-9c825060c904}*SharedItemsImports = 4
-		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{fc044d89-0ff3-441d-b35d-87454a693c16}*SharedItemsImports = 4
-		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{ff1793e1-77f5-4a92-b3f2-6d8b104e479b}*SharedItemsImports = 4
-		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{ffbc46f0-1874-42e9-8270-bbf962ef32d1}*SharedItemsImports = 5
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Debug|x64.Build.0 = Debug|Any CPU
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Release|x64.ActiveCfg = Release|Any CPU
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Release|x64.Build.0 = Release|Any CPU
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Release|x64.Build.0 = Release|Any CPU
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Debug|x64.Build.0 = Debug|Any CPU
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Release|x64.ActiveCfg = Release|Any CPU
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Release|x64.Build.0 = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|x64.Build.0 = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|Any CPU.Build.0 = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|x64.ActiveCfg = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|x64.Build.0 = Release|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|x64.ActiveCfg = Debug|x64
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|x64.Build.0 = Debug|x64
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|x64.ActiveCfg = Release|x64
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|x64.Build.0 = Release|x64
-		{60BE029E-1F31-4473-8B68-A745A43AF179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60BE029E-1F31-4473-8B68-A745A43AF179}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60BE029E-1F31-4473-8B68-A745A43AF179}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60BE029E-1F31-4473-8B68-A745A43AF179}.Debug|x64.Build.0 = Debug|Any CPU
-		{60BE029E-1F31-4473-8B68-A745A43AF179}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60BE029E-1F31-4473-8B68-A745A43AF179}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60BE029E-1F31-4473-8B68-A745A43AF179}.Release|x64.ActiveCfg = Release|Any CPU
-		{60BE029E-1F31-4473-8B68-A745A43AF179}.Release|x64.Build.0 = Release|Any CPU
-		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Debug|x64.Build.0 = Debug|Any CPU
-		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Release|x64.ActiveCfg = Release|Any CPU
-		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Release|x64.Build.0 = Release|Any CPU
-		{8BBED205-C34E-4226-8757-0B576132D2BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BBED205-C34E-4226-8757-0B576132D2BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BBED205-C34E-4226-8757-0B576132D2BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8BBED205-C34E-4226-8757-0B576132D2BC}.Debug|x64.Build.0 = Debug|Any CPU
-		{8BBED205-C34E-4226-8757-0B576132D2BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BBED205-C34E-4226-8757-0B576132D2BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BBED205-C34E-4226-8757-0B576132D2BC}.Release|x64.ActiveCfg = Release|Any CPU
-		{8BBED205-C34E-4226-8757-0B576132D2BC}.Release|x64.Build.0 = Release|Any CPU
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Debug|x64.Build.0 = Debug|Any CPU
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Release|x64.ActiveCfg = Release|Any CPU
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Release|x64.Build.0 = Release|Any CPU
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|x64.Build.0 = Debug|Any CPU
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|x64.ActiveCfg = Release|Any CPU
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|x64.Build.0 = Release|Any CPU
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Debug|x64.Build.0 = Debug|Any CPU
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Release|x64.ActiveCfg = Release|Any CPU
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Release|x64.Build.0 = Release|Any CPU
-		{3DF12639-78B6-41B3-A046-A675035369BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DF12639-78B6-41B3-A046-A675035369BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DF12639-78B6-41B3-A046-A675035369BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3DF12639-78B6-41B3-A046-A675035369BE}.Debug|x64.Build.0 = Debug|Any CPU
-		{3DF12639-78B6-41B3-A046-A675035369BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DF12639-78B6-41B3-A046-A675035369BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DF12639-78B6-41B3-A046-A675035369BE}.Release|x64.ActiveCfg = Release|Any CPU
-		{3DF12639-78B6-41B3-A046-A675035369BE}.Release|x64.Build.0 = Release|Any CPU
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Debug|x64.Build.0 = Debug|Any CPU
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Release|x64.ActiveCfg = Release|Any CPU
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Release|x64.Build.0 = Release|Any CPU
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Debug|x64.Build.0 = Debug|Any CPU
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Release|x64.ActiveCfg = Release|Any CPU
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Release|x64.Build.0 = Release|Any CPU
-		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Debug|x64.Build.0 = Debug|Any CPU
-		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Release|x64.ActiveCfg = Release|Any CPU
-		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Release|x64.Build.0 = Release|Any CPU
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Debug|x64.Build.0 = Debug|Any CPU
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Release|x64.ActiveCfg = Release|Any CPU
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Release|x64.Build.0 = Release|Any CPU
-		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Debug|x64.Build.0 = Debug|Any CPU
-		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|x64.ActiveCfg = Release|Any CPU
-		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|x64.Build.0 = Release|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|x64.Build.0 = Debug|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Release|x64.ActiveCfg = Release|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Release|x64.Build.0 = Release|Any CPU
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Debug|x64.Build.0 = Debug|Any CPU
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Release|x64.ActiveCfg = Release|Any CPU
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Release|x64.Build.0 = Release|Any CPU
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Debug|x64.Build.0 = Debug|Any CPU
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Release|Any CPU.Build.0 = Release|Any CPU
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Release|x64.ActiveCfg = Release|Any CPU
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Release|x64.Build.0 = Release|Any CPU
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Debug|x64.Build.0 = Debug|Any CPU
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Release|x64.ActiveCfg = Release|Any CPU
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Release|x64.Build.0 = Release|Any CPU
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Debug|x64.Build.0 = Debug|Any CPU
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Release|x64.ActiveCfg = Release|Any CPU
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Release|x64.Build.0 = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|x64.Build.0 = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|x64.ActiveCfg = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|x64.Build.0 = Release|Any CPU
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Debug|x64.Build.0 = Debug|Any CPU
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Release|x64.ActiveCfg = Release|Any CPU
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Release|x64.Build.0 = Release|Any CPU
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Debug|x64.Build.0 = Debug|Any CPU
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Release|x64.ActiveCfg = Release|Any CPU
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Release|x64.Build.0 = Release|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|x64.Build.0 = Debug|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|x64.ActiveCfg = Release|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|x64.Build.0 = Release|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|x64.Build.0 = Debug|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|x64.Build.0 = Release|Any CPU
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Debug|x64.Build.0 = Debug|Any CPU
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Release|x64.ActiveCfg = Release|Any CPU
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Release|x64.Build.0 = Release|Any CPU
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Debug|x64.Build.0 = Debug|Any CPU
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Release|x64.Build.0 = Release|Any CPU
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Debug|x64.Build.0 = Debug|Any CPU
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Release|x64.ActiveCfg = Release|Any CPU
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Release|x64.Build.0 = Release|Any CPU
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Debug|x64.Build.0 = Debug|Any CPU
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Release|x64.ActiveCfg = Release|Any CPU
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Release|x64.Build.0 = Release|Any CPU
-		{FC044D89-0FF3-441D-B35D-87454A693C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC044D89-0FF3-441D-B35D-87454A693C16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC044D89-0FF3-441D-B35D-87454A693C16}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FC044D89-0FF3-441D-B35D-87454A693C16}.Debug|x64.Build.0 = Debug|Any CPU
-		{FC044D89-0FF3-441D-B35D-87454A693C16}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC044D89-0FF3-441D-B35D-87454A693C16}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC044D89-0FF3-441D-B35D-87454A693C16}.Release|x64.ActiveCfg = Release|Any CPU
-		{FC044D89-0FF3-441D-B35D-87454A693C16}.Release|x64.Build.0 = Release|Any CPU
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Debug|x64.Build.0 = Debug|Any CPU
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Release|x64.ActiveCfg = Release|Any CPU
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Release|x64.Build.0 = Release|Any CPU
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Debug|x64.Build.0 = Debug|Any CPU
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Release|x64.ActiveCfg = Release|Any CPU
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Release|x64.Build.0 = Release|Any CPU
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Debug|x64.Build.0 = Debug|Any CPU
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Release|x64.ActiveCfg = Release|Any CPU
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Release|x64.Build.0 = Release|Any CPU
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Debug|x64.Build.0 = Debug|Any CPU
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Release|x64.ActiveCfg = Release|Any CPU
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Release|x64.Build.0 = Release|Any CPU
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Debug|x64.Build.0 = Debug|Any CPU
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Release|x64.ActiveCfg = Release|Any CPU
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Release|x64.Build.0 = Release|Any CPU
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Debug|x64.Build.0 = Debug|Any CPU
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Release|x64.ActiveCfg = Release|Any CPU
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Release|x64.Build.0 = Release|Any CPU
-		{76937388-BC9E-4083-9D6E-59CC627E3804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76937388-BC9E-4083-9D6E-59CC627E3804}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76937388-BC9E-4083-9D6E-59CC627E3804}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76937388-BC9E-4083-9D6E-59CC627E3804}.Debug|x64.Build.0 = Debug|Any CPU
-		{76937388-BC9E-4083-9D6E-59CC627E3804}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76937388-BC9E-4083-9D6E-59CC627E3804}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76937388-BC9E-4083-9D6E-59CC627E3804}.Release|x64.ActiveCfg = Release|Any CPU
-		{76937388-BC9E-4083-9D6E-59CC627E3804}.Release|x64.Build.0 = Release|Any CPU
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Debug|x64.Build.0 = Debug|Any CPU
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Release|x64.ActiveCfg = Release|Any CPU
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Release|x64.Build.0 = Release|Any CPU
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}.Debug|x64.Build.0 = Debug|Any CPU
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}.Release|x64.ActiveCfg = Release|Any CPU
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D}.Release|x64.Build.0 = Release|Any CPU
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Debug|x64.Build.0 = Debug|Any CPU
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Release|x64.ActiveCfg = Release|Any CPU
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Release|x64.Build.0 = Release|Any CPU
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Debug|x64.Build.0 = Debug|Any CPU
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Release|x64.ActiveCfg = Release|Any CPU
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Release|x64.Build.0 = Release|Any CPU
-		{67157264-AAA5-46A8-A38B-16254B49B892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67157264-AAA5-46A8-A38B-16254B49B892}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67157264-AAA5-46A8-A38B-16254B49B892}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{67157264-AAA5-46A8-A38B-16254B49B892}.Debug|x64.Build.0 = Debug|Any CPU
-		{67157264-AAA5-46A8-A38B-16254B49B892}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67157264-AAA5-46A8-A38B-16254B49B892}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67157264-AAA5-46A8-A38B-16254B49B892}.Release|x64.ActiveCfg = Release|Any CPU
-		{67157264-AAA5-46A8-A38B-16254B49B892}.Release|x64.Build.0 = Release|Any CPU
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Debug|x64.Build.0 = Debug|Any CPU
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Release|x64.ActiveCfg = Release|Any CPU
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Release|x64.Build.0 = Release|Any CPU
-		{C1D53822-B11F-4772-996E-1E6D485E0702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1D53822-B11F-4772-996E-1E6D485E0702}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1D53822-B11F-4772-996E-1E6D485E0702}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1D53822-B11F-4772-996E-1E6D485E0702}.Debug|x64.Build.0 = Debug|Any CPU
-		{C1D53822-B11F-4772-996E-1E6D485E0702}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1D53822-B11F-4772-996E-1E6D485E0702}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1D53822-B11F-4772-996E-1E6D485E0702}.Release|x64.ActiveCfg = Release|Any CPU
-		{C1D53822-B11F-4772-996E-1E6D485E0702}.Release|x64.Build.0 = Release|Any CPU
-		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Debug|x64.Build.0 = Debug|Any CPU
-		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Release|x64.ActiveCfg = Release|Any CPU
-		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Release|x64.Build.0 = Release|Any CPU
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Debug|x64.Build.0 = Debug|Any CPU
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Release|x64.ActiveCfg = Release|Any CPU
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Release|x64.Build.0 = Release|Any CPU
-		{442116F3-0F4A-4136-894E-FF5F4295500B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{442116F3-0F4A-4136-894E-FF5F4295500B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{442116F3-0F4A-4136-894E-FF5F4295500B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{442116F3-0F4A-4136-894E-FF5F4295500B}.Debug|x64.Build.0 = Debug|Any CPU
-		{442116F3-0F4A-4136-894E-FF5F4295500B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{442116F3-0F4A-4136-894E-FF5F4295500B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{442116F3-0F4A-4136-894E-FF5F4295500B}.Release|x64.ActiveCfg = Release|Any CPU
-		{442116F3-0F4A-4136-894E-FF5F4295500B}.Release|x64.Build.0 = Release|Any CPU
-		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Debug|x64.Build.0 = Debug|Any CPU
-		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Release|Any CPU.Build.0 = Release|Any CPU
-		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Release|x64.ActiveCfg = Release|Any CPU
-		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Release|x64.Build.0 = Release|Any CPU
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Debug|x64.Build.0 = Debug|Any CPU
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Release|x64.ActiveCfg = Release|Any CPU
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Release|x64.Build.0 = Release|Any CPU
-		{81299D15-5788-414D-A962-1A568C251323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81299D15-5788-414D-A962-1A568C251323}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81299D15-5788-414D-A962-1A568C251323}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81299D15-5788-414D-A962-1A568C251323}.Debug|x64.Build.0 = Debug|Any CPU
-		{81299D15-5788-414D-A962-1A568C251323}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81299D15-5788-414D-A962-1A568C251323}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81299D15-5788-414D-A962-1A568C251323}.Release|x64.ActiveCfg = Release|Any CPU
-		{81299D15-5788-414D-A962-1A568C251323}.Release|x64.Build.0 = Release|Any CPU
-		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Debug|x64.Build.0 = Debug|Any CPU
-		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Release|x64.ActiveCfg = Release|Any CPU
-		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Release|x64.Build.0 = Release|Any CPU
-		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Debug|x64.Build.0 = Debug|Any CPU
-		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Release|x64.ActiveCfg = Release|Any CPU
-		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Release|x64.Build.0 = Release|Any CPU
-		{C091E499-597D-4077-B83F-08E069091090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C091E499-597D-4077-B83F-08E069091090}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C091E499-597D-4077-B83F-08E069091090}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C091E499-597D-4077-B83F-08E069091090}.Debug|x64.Build.0 = Debug|Any CPU
-		{C091E499-597D-4077-B83F-08E069091090}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C091E499-597D-4077-B83F-08E069091090}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C091E499-597D-4077-B83F-08E069091090}.Release|x64.ActiveCfg = Release|Any CPU
-		{C091E499-597D-4077-B83F-08E069091090}.Release|x64.Build.0 = Release|Any CPU
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Debug|x64.Build.0 = Debug|Any CPU
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Release|x64.ActiveCfg = Release|Any CPU
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Release|x64.Build.0 = Release|Any CPU
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Debug|x64.Build.0 = Debug|Any CPU
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Release|x64.ActiveCfg = Release|Any CPU
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Release|x64.Build.0 = Release|Any CPU
-		{D163D710-B946-4D50-8833-BD8B9941033A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D163D710-B946-4D50-8833-BD8B9941033A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D163D710-B946-4D50-8833-BD8B9941033A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D163D710-B946-4D50-8833-BD8B9941033A}.Debug|x64.Build.0 = Debug|Any CPU
-		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|x64.ActiveCfg = Release|Any CPU
-		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|x64.Build.0 = Release|Any CPU
-		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|x64.Build.0 = Debug|Any CPU
-		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|x64.ActiveCfg = Release|Any CPU
-		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|x64.Build.0 = Release|Any CPU
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|x64.Build.0 = Debug|Any CPU
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|x64.ActiveCfg = Release|Any CPU
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|x64.Build.0 = Release|Any CPU
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|x64.Build.0 = Debug|Any CPU
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|x64.ActiveCfg = Release|Any CPU
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|x64.Build.0 = Release|Any CPU
-		{3D066801-9823-48ED-8FB3-273B53825808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D066801-9823-48ED-8FB3-273B53825808}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D066801-9823-48ED-8FB3-273B53825808}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D066801-9823-48ED-8FB3-273B53825808}.Debug|x64.Build.0 = Debug|Any CPU
-		{3D066801-9823-48ED-8FB3-273B53825808}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D066801-9823-48ED-8FB3-273B53825808}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D066801-9823-48ED-8FB3-273B53825808}.Release|x64.ActiveCfg = Release|Any CPU
-		{3D066801-9823-48ED-8FB3-273B53825808}.Release|x64.Build.0 = Release|Any CPU
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|x64.Build.0 = Debug|Any CPU
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|x64.ActiveCfg = Release|Any CPU
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|x64.Build.0 = Release|Any CPU
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|x64.Build.0 = Debug|Any CPU
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|Any CPU.Build.0 = Release|Any CPU
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|x64.ActiveCfg = Release|Any CPU
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|x64.Build.0 = Release|Any CPU
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Debug|x64.Build.0 = Debug|Any CPU
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Release|x64.ActiveCfg = Release|Any CPU
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Release|x64.Build.0 = Release|Any CPU
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Debug|x64.Build.0 = Debug|Any CPU
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Release|x64.ActiveCfg = Release|Any CPU
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Release|x64.Build.0 = Release|Any CPU
-		{CC790553-8088-41A9-83CD-B29F7141F408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC790553-8088-41A9-83CD-B29F7141F408}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC790553-8088-41A9-83CD-B29F7141F408}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CC790553-8088-41A9-83CD-B29F7141F408}.Debug|x64.Build.0 = Debug|Any CPU
-		{CC790553-8088-41A9-83CD-B29F7141F408}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC790553-8088-41A9-83CD-B29F7141F408}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC790553-8088-41A9-83CD-B29F7141F408}.Release|x64.ActiveCfg = Release|Any CPU
-		{CC790553-8088-41A9-83CD-B29F7141F408}.Release|x64.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CB6F8F77-4487-469B-896A-1EEEC4451A04} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F} = {CB6F8F77-4487-469B-896A-1EEEC4451A04}
-		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A} = {CB6F8F77-4487-469B-896A-1EEEC4451A04}
-		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906} = {CB6F8F77-4487-469B-896A-1EEEC4451A04}
-		{109B3382-634B-408A-8A5C-4CD09CB92641} = {9461B162-AD2F-4F60-BCE4-E72DCEFD4608}
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
-		{60BE029E-1F31-4473-8B68-A745A43AF179} = {E3916A0F-68D5-4C84-ACAE-41547F75E454}
-		{8BBED205-C34E-4226-8757-0B576132D2BC} = {DC6BE73D-4D60-4F90-9778-D44151CD6F98}
-		{8FA5494A-D651-4C80-9B69-EB1808CF64F8} = {DC6BE73D-4D60-4F90-9778-D44151CD6F98}
-		{4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D} = {E3916A0F-68D5-4C84-ACAE-41547F75E454}
-		{42A86931-7497-4A34-B2FD-060231CD0A8F} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
-		{5FD0D810-03E9-4FD2-93E4-B1B51E5D82C5} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
-		{925C0BF6-A0B1-4699-9C4B-078E01D652CC} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
-		{2DCD648D-DCA5-4D2A-8B14-AD2CB85D24B0} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
-		{F0DD5C38-083B-43EA-8654-96247028D8AC} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
-		{5BAB09DC-B0FC-4004-9FD5-6496A9634071} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
-		{AACD5D91-99F1-4E69-B23B-E25239E5FB59} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
-		{3DF12639-78B6-41B3-A046-A675035369BE} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
-		{890F3257-FCC2-4ED8-9180-22B3641B494C} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{58A88F1A-7489-46D2-949D-2FC3F68C8D84} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
-		{B47492D9-2EDA-4016-A930-7FA708C85C3D} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
-		{AD10C167-937F-4706-9EB5-C99F86C35E8F} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
-		{BE521908-7944-46F3-98BF-B47D34509934} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
-		{78573ADC-87A5-489F-8134-FB4A435A05F0} = {BE521908-7944-46F3-98BF-B47D34509934}
-		{2D0F9F8A-2E89-4780-978A-CD92D6D7B843} = {BE521908-7944-46F3-98BF-B47D34509934}
-		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE} = {BE521908-7944-46F3-98BF-B47D34509934}
-		{8A53B084-20D8-48F6-9591-9D53CFA74130} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
-		{EF418256-8118-47B4-8386-A945946FB92D} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
-		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
-		{464F2220-D7D9-4D8C-BB3D-B93A1C603469} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
-		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09} = {BE521908-7944-46F3-98BF-B47D34509934}
-		{8581B4BB-A8BC-4328-99FE-D18615AF2554} = {BE521908-7944-46F3-98BF-B47D34509934}
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067} = {9461B162-AD2F-4F60-BCE4-E72DCEFD4608}
-		{1FD850CA-A8D7-41DC-9316-B315800437E1} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
-		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55} = {1FD850CA-A8D7-41DC-9316-B315800437E1}
-		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6} = {1FD850CA-A8D7-41DC-9316-B315800437E1}
-		{B74CB8C1-187B-46A6-B20B-92B8C129F3EE} = {1FD850CA-A8D7-41DC-9316-B315800437E1}
-		{9461B162-AD2F-4F60-BCE4-E72DCEFD4608} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{E94E7327-5A9B-48EE-93CC-E9E9A5B980F1} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{D648BB69-B992-4D34-906E-7A547374B86C} = {E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4} = {E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}
-		{B7376EC8-5D3E-47D2-96A7-748552F14C39} = {E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}
-		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21} = {85C30B55-E486-49AE-B3F5-6A196D14CCB8}
-		{85C30B55-E486-49AE-B3F5-6A196D14CCB8} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
-		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
-		{0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{0420D74A-2997-4B92-844B-C3769DEAA1AD} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
-		{372D9F0F-EDE9-4050-BF8C-758911C5C2E0} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
-		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
-		{FC044D89-0FF3-441D-B35D-87454A693C16} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
-		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
-		{B9D189AE-B0AE-49BC-A0A5-ACF87C849615} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
-		{BD2287FA-8272-4D14-9A26-889092AEBFE0} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
-		{208B25E4-2D0E-4534-B197-4C5C96CC53CE} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
-		{FFBC46F0-1874-42E9-8270-BBF962EF32D1} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
-		{C96D609B-B210-401C-8FFC-5D17F324E9E8} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
-		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
-		{D1D0F986-12BE-4FD5-8925-C96B1F86427D} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
-		{76937388-BC9E-4083-9D6E-59CC627E3804} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
-		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
-		{98136BFC-A71B-48AD-B0D2-8A5A07FD3D6D} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
-		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
-		{18C8730C-0173-4987-9416-46F86EC20541} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{28E2EA7F-FFD1-4E13-9165-0243B5AC82F5} = {18C8730C-0173-4987-9416-46F86EC20541}
-		{3AF1EF30-0906-4926-A02C-4E3AD666352A} = {18C8730C-0173-4987-9416-46F86EC20541}
-		{67157264-AAA5-46A8-A38B-16254B49B892} = {18C8730C-0173-4987-9416-46F86EC20541}
-		{5D988C50-8E85-402A-9020-A4AB0565F0C9} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
-		{02A24DD8-E0CA-4657-BAA7-B033A4563709} = {5D988C50-8E85-402A-9020-A4AB0565F0C9}
-		{C1D53822-B11F-4772-996E-1E6D485E0702} = {5D988C50-8E85-402A-9020-A4AB0565F0C9}
-		{7FFDAB72-145D-4490-9892-FAC5F1D72B17} = {5D988C50-8E85-402A-9020-A4AB0565F0C9}
-		{7E702AF1-3A72-454D-BE04-D2AF4EF1304B} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
-		{21223BA5-C6E8-405D-B581-106C4726EDC0} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
-		{5BBDE14E-50F8-4D6E-8E35-747667AD4A09} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
-		{D06F557C-452A-4BBE-9B79-A10DB03F3832} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
-		{442116F3-0F4A-4136-894E-FF5F4295500B} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
-		{907AED7A-719B-4157-8CC9-D21CB26E9243} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
-		{11C013F3-2583-4292-938B-707294DAECE1} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{23BE6E54-96C1-4373-89F3-E18A1C9807FD} = {11C013F3-2583-4292-938B-707294DAECE1}
-		{61374CD0-E774-4DCD-BFAB-6356B0931283} = {11C013F3-2583-4292-938B-707294DAECE1}
-		{81299D15-5788-414D-A962-1A568C251323} = {11C013F3-2583-4292-938B-707294DAECE1}
-		{9D188843-8841-4A76-A844-EFBE8E32EE05} = {11C013F3-2583-4292-938B-707294DAECE1}
-		{31E0C098-6813-4571-AB96-A245E0FC1C23} = {11C013F3-2583-4292-938B-707294DAECE1}
-		{C091E499-597D-4077-B83F-08E069091090} = {11C013F3-2583-4292-938B-707294DAECE1}
-		{C59939F6-D383-44E3-A7EF-4E160E3DFB73} = {11C013F3-2583-4292-938B-707294DAECE1}
-		{586A5A37-93F6-427E-8DF8-C10DB4D6822A} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
-		{DF1B3505-793C-4073-975B-04C81CC3CDC4} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{D163D710-B946-4D50-8833-BD8B9941033A} = {DF1B3505-793C-4073-975B-04C81CC3CDC4}
-		{F4BFB155-7BA9-4E46-8240-9C825060C904} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
-		{2639E37D-80D3-415A-B4D1-20D7F321F27F} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
-		{59764E6A-8366-4AF3-AB0A-BA28BD0318FA} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
-		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
-		{3D066801-9823-48ED-8FB3-273B53825808} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
-		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
-		{050E8BAB-773E-4FE6-BD38-F71CF65FC257} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
-		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
-		{67A463D3-E98B-4B16-B069-D7BBB05386A1} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
-		{CC790553-8088-41A9-83CD-B29F7141F408} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32210.238
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Connectors", "Connectors", "{DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dynamo", "Dynamo", "{CB6F8F77-4487-469B-896A-1EEEC4451A04}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDynamo", "ConnectorDynamo\ConnectorDynamo\ConnectorDynamo.csproj", "{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDynamoExtension", "ConnectorDynamo\ConnectorDynamoExtension\ConnectorDynamoExtension.csproj", "{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDynamoFunctions", "ConnectorDynamo\ConnectorDynamoFunctions\ConnectorDynamoFunctions.csproj", "{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorGrasshopper", "ConnectorGrasshopper\ConnectorGrasshopper\ConnectorGrasshopper.csproj", "{109B3382-634B-408A-8A5C-4CD09CB92641}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopUI", "DesktopUI\DesktopUI\DesktopUI.csproj", "{A97C3046-2D55-4C49-AB40-A3C2194B82FA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Objects", "Objects\Objects\Objects.csproj", "{60BE029E-1F31-4473-8B68-A745A43AF179}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core\Core.csproj", "{A2C8730A-B605-483E-914E-61F3ED7954D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiskTransport", "Core\Transports\DiskTransport\DiskTransport.csproj", "{8BBED205-C34E-4226-8757-0B576132D2BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDBTransport", "Core\Transports\MongoDBTransport\MongoDBTransport.csproj", "{8FA5494A-D651-4C80-9B69-EB1808CF64F8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Transports", "Transports", "{DC6BE73D-4D60-4F90-9778-D44151CD6F98}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Objects", "Objects", "{E3916A0F-68D5-4C84-ACAE-41547F75E454}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Converters", "Converters", "{4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Revit", "Revit", "{42A86931-7497-4A34-B2FD-060231CD0A8F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2021", "ConnectorRevit\ConnectorRevit2021\ConnectorRevit2021.csproj", "{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorRevitShared", "ConnectorRevit\ConnectorRevit\ConnectorRevitShared.shproj", "{5FD0D810-03E9-4FD2-93E4-B1B51E5D82C5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterRevit", "ConverterRevit", "{925C0BF6-A0B1-4699-9C4B-078E01D652CC}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterRevitShared", "Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.shproj", "{2DCD648D-DCA5-4D2A-8B14-AD2CB85D24B0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterDynamo", "ConverterDynamo", "{F0DD5C38-083B-43EA-8654-96247028D8AC}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterDynamoShared", "Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.shproj", "{5BAB09DC-B0FC-4004-9FD5-6496A9634071}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit\ConverterDynamoRevit.csproj", "{AACD5D91-99F1-4E69-B23B-E25239E5FB59}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoSandbox", "Objects\Converters\ConverterDynamo\ConverterDynamoSandbox\ConverterDynamoSandbox.csproj", "{3DF12639-78B6-41B3-A046-A675035369BE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutocadCivil", "AutocadCivil", "{890F3257-FCC2-4ED8-9180-22B3641B494C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2021", "ConnectorAutocadCivil\ConnectorAutocad2021\ConnectorAutocad2021.csproj", "{58A88F1A-7489-46D2-949D-2FC3F68C8D84}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorAutocadCivilShared", "ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.shproj", "{B47492D9-2EDA-4016-A930-7FA708C85C3D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2021", "ConnectorAutocadCivil\ConnectorCivil2021\ConnectorCivil2021.csproj", "{AD10C167-937F-4706-9EB5-C99F86C35E8F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterAutocadCivil", "ConverterAutocadCivil", "{BE521908-7944-46F3-98BF-B47D34509934}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2021", "Objects\Converters\ConverterAutocadCivil\ConverterAutocad2021\ConverterAutocad2021.csproj", "{78573ADC-87A5-489F-8134-FB4A435A05F0}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterAutocadCivilShared", "Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.shproj", "{2D0F9F8A-2E89-4780-978A-CD92D6D7B843}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2021", "Objects\Converters\ConverterAutocadCivil\ConverterCivil2021\ConverterCivil2021.csproj", "{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2020", "ConnectorRevit\ConnectorRevit2020\ConnectorRevit2020.csproj", "{8A53B084-20D8-48F6-9591-9D53CFA74130}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2022", "ConnectorAutocadCivil\ConnectorAutocad2022\ConnectorAutocad2022.csproj", "{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2022", "ConnectorAutocadCivil\ConnectorCivil2022\ConnectorCivil2022.csproj", "{464F2220-D7D9-4D8C-BB3D-B93A1C603469}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2022", "Objects\Converters\ConverterAutocadCivil\ConverterAutocad2022\ConverterAutocad2022.csproj", "{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2022", "Objects\Converters\ConverterAutocadCivil\ConverterCivil2022\ConverterCivil2022.csproj", "{8581B4BB-A8BC-4328-99FE-D18615AF2554}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorGrasshopperUtils", "ConnectorGrasshopper\ConnectorGrasshopperUtils\ConnectorGrasshopperUtils.csproj", "{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterRhino", "ConverterRhino", "{1FD850CA-A8D7-41DC-9316-B315800437E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRhino6", "Objects\Converters\ConverterRhinoGh\ConverterRhino6\ConverterRhino6.csproj", "{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRhino7", "Objects\Converters\ConverterRhinoGh\ConverterRhino7\ConverterRhino7.csproj", "{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterRhinoGhShared", "Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.shproj", "{B74CB8C1-187B-46A6-B20B-92B8C129F3EE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Grasshopper", "Grasshopper", "{9461B162-AD2F-4F60-BCE4-E72DCEFD4608}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rhino", "Rhino", "{E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorRhino6", "ConnectorRhino\ConnectorRhino6\ConnectorRhino6.csproj", "{D648BB69-B992-4D34-906E-7A547374B86C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorRhino7", "ConnectorRhino\ConnectorRhino7\ConnectorRhino7.csproj", "{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorRhinoShared", "ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.shproj", "{B7376EC8-5D3E-47D2-96A7-748552F14C39}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolygonMesher", "Objects\Converters\StructuralUtilities\PolygonMesher\PolygonMesher.csproj", "{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StructuralUtilities", "StructuralUtilities", "{85C30B55-E486-49AE-B3F5-6A196D14CCB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2", "DesktopUI2\DesktopUI2\DesktopUI2.csproj", "{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicroStation", "MicroStation", "{0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorMicroStation", "ConnectorMicroStation\ConnectorMicroStation\ConnectorMicroStation.csproj", "{0420D74A-2997-4B92-844B-C3769DEAA1AD}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorMicroStationOpenShared", "ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.shproj", "{372D9F0F-EDE9-4050-BF8C-758911C5C2E0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorOpenBuildings", "ConnectorMicroStation\ConnectorOpenBuildings\ConnectorOpenBuildings.csproj", "{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorOpenRail", "ConnectorMicroStation\ConnectorOpenRail\ConnectorOpenRail.csproj", "{FC044D89-0FF3-441D-B35D-87454A693C16}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorOpenRoads", "ConnectorMicroStation\ConnectorOpenRoads\ConnectorOpenRoads.csproj", "{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterMicroStation", "ConverterMicroStation", "{B9D189AE-B0AE-49BC-A0A5-ACF87C849615}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterMicroStation", "Objects\Converters\ConverterMicroStation\ConverterMicroStation\ConverterMicroStation.csproj", "{BD2287FA-8272-4D14-9A26-889092AEBFE0}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterMicroStationOpenShared", "Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.shproj", "{208B25E4-2D0E-4534-B197-4C5C96CC53CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterOpenBuildings", "Objects\Converters\ConverterMicroStation\ConverterOpenBuildings\ConverterOpenBuildings.csproj", "{FFBC46F0-1874-42E9-8270-BBF962EF32D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterOpenRail", "Objects\Converters\ConverterMicroStation\ConverterOpenRail\ConverterOpenRail.csproj", "{C96D609B-B210-401C-8FFC-5D17F324E9E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterOpenRoads", "Objects\Converters\ConverterMicroStation\ConverterOpenRoads\ConverterOpenRoads.csproj", "{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2021", "Objects\Converters\ConverterRevit\ConverterRevit2021\ConverterRevit2021.csproj", "{D1D0F986-12BE-4FD5-8925-C96B1F86427D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2022", "Objects\Converters\ConverterRevit\ConverterRevit2022\ConverterRevit2022.csproj", "{76937388-BC9E-4083-9D6E-59CC627E3804}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2020", "Objects\Converters\ConverterRevit\ConverterRevit2020\ConverterRevit2020.csproj", "{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2022", "ConnectorRevit\ConnectorRevit2022\ConnectorRevit2022.csproj", "{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TeklaStructures", "TeklaStructures", "{18C8730C-0173-4987-9416-46F86EC20541}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorTeklaStructuresShared", "ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.shproj", "{28E2EA7F-FFD1-4E13-9165-0243B5AC82F5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorTeklaStructures2021", "ConnectorTeklaStructures\ConnectorTeklaStructures2021\ConnectorTeklaStructures2021.csproj", "{3AF1EF30-0906-4926-A02C-4E3AD666352A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorTeklaStructures2020", "ConnectorTeklaStructures\ConnectorTeklaStructures2020\ConnectorTeklaStructures2020.csproj", "{67157264-AAA5-46A8-A38B-16254B49B892}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterTeklaStructures", "ConverterTeklaStructures", "{5D988C50-8E85-402A-9020-A4AB0565F0C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterTeklaStructures2020", "Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructures2020\ConverterTeklaStructures2020.csproj", "{02A24DD8-E0CA-4657-BAA7-B033A4563709}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterTeklaStructures2021", "Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructures2021\ConverterTeklaStructures2021.csproj", "{C1D53822-B11F-4772-996E-1E6D485E0702}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterTeklaStructuresShared", "Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.shproj", "{7FFDAB72-145D-4490-9892-FAC5F1D72B17}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterCSI", "ConverterCSI", "{7E702AF1-3A72-454D-BE04-D2AF4EF1304B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCSIBridge", "Objects\Converters\ConverterCSI\ConverterCSIBridge\ConverterCSIBridge.csproj", "{21223BA5-C6E8-405D-B581-106C4726EDC0}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterCSIShared", "Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.shproj", "{5BBDE14E-50F8-4D6E-8E35-747667AD4A09}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterETABS", "Objects\Converters\ConverterCSI\ConverterETABS\ConverterETABS.csproj", "{D06F557C-452A-4BBE-9B79-A10DB03F3832}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterSAFE", "Objects\Converters\ConverterCSI\ConverterSAFE\ConverterSAFE.csproj", "{442116F3-0F4A-4136-894E-FF5F4295500B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterSAP2000", "Objects\Converters\ConverterCSI\ConverterSAP2000\ConverterSAP2000.csproj", "{907AED7A-719B-4157-8CC9-D21CB26E9243}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSI", "CSI", "{11C013F3-2583-4292-938B-707294DAECE1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCSIBridge", "ConnectorCSI\ConnectorCSIBridge\ConnectorCSIBridge.csproj", "{23BE6E54-96C1-4373-89F3-E18A1C9807FD}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorCSIShared", "ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.shproj", "{61374CD0-E774-4DCD-BFAB-6356B0931283}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorETABS", "ConnectorCSI\ConnectorETABS\ConnectorETABS.csproj", "{81299D15-5788-414D-A962-1A568C251323}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorSAFE", "ConnectorCSI\ConnectorSAFE\ConnectorSAFE.csproj", "{9D188843-8841-4A76-A844-EFBE8E32EE05}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorSAP2000", "ConnectorCSI\ConnectorSAP2000\ConnectorSAP2000.csproj", "{31E0C098-6813-4571-AB96-A245E0FC1C23}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriverCSharp", "ConnectorCSI\DriverCSharp\DriverCSharp.csproj", "{C091E499-597D-4077-B83F-08E069091090}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriverPluginCSharp", "ConnectorCSI\DriverPluginCSharp\DriverPluginCSharp.csproj", "{C59939F6-D383-44E3-A7EF-4E160E3DFB73}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2023", "ConnectorRevit\ConnectorRevit2023\ConnectorRevit2023.csproj", "{586A5A37-93F6-427E-8DF8-C10DB4D6822A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArchiCAD", "ArchiCAD", "{DF1B3505-793C-4073-975B-04C81CC3CDC4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorArchicad", "ConnectorArchicad\ConnectorArchicad\ConnectorArchicad.csproj", "{D163D710-B946-4D50-8833-BD8B9941033A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2023", "ConnectorAutocadCivil\ConnectorAutocad2023\ConnectorAutocad2023.csproj", "{F4BFB155-7BA9-4E46-8240-9C825060C904}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2023", "ConnectorAutocadCivil\ConnectorCivil2023\ConnectorCivil2023.csproj", "{2639E37D-80D3-415A-B4D1-20D7F321F27F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DesktopUI", "DesktopUI", "{59764E6A-8366-4AF3-AB0A-BA28BD0318FA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2.Launcher", "DesktopUI2\DesktopUI2.Launcher\DesktopUI2.Launcher.csproj", "{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2.WPF", "DesktopUI2\DesktopUI2.WPF\DesktopUI2.WPF.csproj", "{3D066801-9823-48ED-8FB3-273B53825808}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDxf", "Objects\Converters\ConverterDxf\ConverterDxf\ConverterDxf.csproj", "{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaHwndHost", "DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj", "{050E8BAB-773E-4FE6-BD38-F71CF65FC257}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit2021", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit2021\ConverterDynamoRevit2021.csproj", "{4DBF45EE-3BCE-47F4-B399-963B36A31951}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit2022", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit2022\ConverterDynamoRevit2022.csproj", "{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit2023", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit2023\ConverterDynamoRevit2023.csproj", "{67A463D3-E98B-4B16-B069-D7BBB05386A1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2023", "Objects\Converters\ConverterRevit\ConverterRevit2023\ConverterRevit2023.csproj", "{CC790553-8088-41A9-83CD-B29F7141F408}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Objects\Tests\Tests.csproj", "{4BED69F3-5835-4224-BD2C-50FA65C11395}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{02a24dd8-e0ca-4657-baa7-b033a4563709}*SharedItemsImports = 5
+		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{0420d74a-2997-4b92-844b-c3769deaa1ad}*SharedItemsImports = 4
+		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{208b25e4-2d0e-4534-b197-4c5c96cc53ce}*SharedItemsImports = 13
+		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{21223ba5-c6e8-405d-b581-106c4726edc0}*SharedItemsImports = 5
+		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4
+		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{2639e37d-80d3-415a-b4d1-20d7f321f27f}*SharedItemsImports = 4
+		Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{26eca1be-f5b2-4a41-9658-46a4a917bfe6}*SharedItemsImports = 5
+		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{27a79aca-7ea8-4406-8bb8-216578cc3ab7}*SharedItemsImports = 4
+		ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{28e2ea7f-ffd1-4e13-9165-0243b5ac82f5}*SharedItemsImports = 13
+		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2d0f9f8a-2e89-4780-978a-cd92d6d7b843}*SharedItemsImports = 13
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13
+		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{31e0c098-6813-4571-ab96-a245e0fc1c23}*SharedItemsImports = 4
+		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{372d9f0f-ede9-4050-bf8c-758911c5c2e0}*SharedItemsImports = 13
+		ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{3af1ef30-0906-4926-a02c-4e3ad666352a}*SharedItemsImports = 4
+		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{3af1ef30-0906-4926-a02c-4e3ad666352a}*SharedItemsImports = 4
+		Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{3cdef4cc-2cfa-4939-8427-3ed00fa9db55}*SharedItemsImports = 5
+		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{3df12639-78b6-41b3-a046-a675035369be}*SharedItemsImports = 5
+		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{442116f3-0f4a-4136-894e-ff5f4295500b}*SharedItemsImports = 5
+		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{464f2220-d7d9-4d8c-bb3d-b93a1c603469}*SharedItemsImports = 4
+		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{4dbf45ee-3bce-47f4-b399-963b36a31951}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{4dbf45ee-3bce-47f4-b399-963b36a31951}*SharedItemsImports = 5
+		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{50bc1552-3e7e-4c77-ac3a-aa7c572dfe09}*SharedItemsImports = 5
+		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{57bf94a8-8f73-4d1a-91d2-b10cc64178b6}*SharedItemsImports = 4
+		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{586a5a37-93f6-427e-8df8-c10db4d6822a}*SharedItemsImports = 4
+		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{58a88f1a-7489-46d2-949d-2fc3f68c8d84}*SharedItemsImports = 4
+		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{5bab09dc-b0fc-4004-9fd5-6496a9634071}*SharedItemsImports = 13
+		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{5bbde14e-50f8-4d6e-8e35-747667ad4a09}*SharedItemsImports = 13
+		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{5fd0d810-03e9-4fd2-93e4-b1b51e5d82c5}*SharedItemsImports = 13
+		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{61374cd0-e774-4dcd-bfab-6356b0931283}*SharedItemsImports = 13
+		ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{67157264-aaa5-46a8-a38b-16254b49b892}*SharedItemsImports = 4
+		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{67157264-aaa5-46a8-a38b-16254b49b892}*SharedItemsImports = 4
+		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{76937388-bc9e-4083-9d6e-59cc627e3804}*SharedItemsImports = 5
+		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{78573adc-87a5-489f-8134-fb4a435a05f0}*SharedItemsImports = 5
+		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{7ffdab72-145d-4490-9892-fac5f1d72b17}*SharedItemsImports = 13
+		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 4
+		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{8581b4bb-a8bc-4328-99fe-d18615af2554}*SharedItemsImports = 5
+		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{8a53b084-20d8-48f6-9591-9d53cfa74130}*SharedItemsImports = 4
+		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{907aed7a-719b-4157-8cc9-d21cb26e9243}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{98136bfc-a71b-48ad-b0d2-8a5a07fd3d6d}*SharedItemsImports = 5
+		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{9d188843-8841-4a76-a844-efbe8e32ee05}*SharedItemsImports = 4
+		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{a3a0ee09-6055-4009-ab8e-13fbc1a403a9}*SharedItemsImports = 4
+		ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{a64acbf9-db82-4839-af99-57ed2e7989f4}*SharedItemsImports = 5
+		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{aaa05c3d-856d-4f22-971e-5e3f066d0eae}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{aaa05c3d-856d-4f22-971e-5e3f066d0eae}*SharedItemsImports = 5
+		Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{aacd5d91-99f1-4e69-b23b-e25239e5fb59}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{aacd5d91-99f1-4e69-b23b-e25239e5fb59}*SharedItemsImports = 5
+		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{ad10c167-937f-4706-9eb5-c99f86c35e8f}*SharedItemsImports = 4
+		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{b47492d9-2eda-4016-a930-7fa708c85c3d}*SharedItemsImports = 13
+		ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{b7376ec8-5d3e-47d2-96a7-748552f14c39}*SharedItemsImports = 13
+		Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13
+		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{bd2287fa-8272-4d14-9a26-889092aebfe0}*SharedItemsImports = 5
+		ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{c091e499-597d-4077-b83f-08e069091090}*SharedItemsImports = 4
+		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{c1d53822-b11f-4772-996e-1e6d485e0702}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{c21a6553-b4ec-4ec3-b82a-c7a83cffb809}*SharedItemsImports = 5
+		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{c96d609b-b210-401c-8ffc-5d17f324e9e8}*SharedItemsImports = 5
+		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{cc10bbc6-09da-4bbb-ae92-3f6097a022f1}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{cc790553-8088-41a9-83cd-b29f7141f408}*SharedItemsImports = 5
+		Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{d06f557c-452a-4bbe-9b79-a10db03f3832}*SharedItemsImports = 5
+		Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{d1d0f986-12be-4fd5-8925-c96b1f86427d}*SharedItemsImports = 5
+		ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{d648bb69-b992-4d34-906e-7a547374b86c}*SharedItemsImports = 5
+		Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{d9f443b5-c55b-4ad8-9c70-bc3d2be781be}*SharedItemsImports = 5
+		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{dfdfdbb8-018b-4dcb-a012-54227abf53a7}*SharedItemsImports = 4
+		ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{ef418256-8118-47b4-8386-a945946fb92d}*SharedItemsImports = 4
+		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4bfb155-7ba9-4e46-8240-9c825060c904}*SharedItemsImports = 4
+		ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{fc044d89-0ff3-441d-b35d-87454a693c16}*SharedItemsImports = 4
+		ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{ff1793e1-77f5-4a92-b3f2-6d8b104e479b}*SharedItemsImports = 4
+		Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{ffbc46f0-1874-42e9-8270-bbf962ef32d1}*SharedItemsImports = 5
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Debug|x64.Build.0 = Debug|Any CPU
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Release|x64.ActiveCfg = Release|Any CPU
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F}.Release|x64.Build.0 = Release|Any CPU
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Debug|x64.Build.0 = Debug|Any CPU
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Release|x64.ActiveCfg = Release|Any CPU
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A}.Release|x64.Build.0 = Release|Any CPU
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Debug|x64.Build.0 = Debug|Any CPU
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Release|x64.ActiveCfg = Release|Any CPU
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}.Release|x64.Build.0 = Release|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|x64.Build.0 = Debug|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|Any CPU.Build.0 = Release|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|x64.ActiveCfg = Release|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|x64.Build.0 = Release|Any CPU
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|x64.ActiveCfg = Debug|x64
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|x64.Build.0 = Debug|x64
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|x64.ActiveCfg = Release|x64
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|x64.Build.0 = Release|x64
+		{60BE029E-1F31-4473-8B68-A745A43AF179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60BE029E-1F31-4473-8B68-A745A43AF179}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60BE029E-1F31-4473-8B68-A745A43AF179}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60BE029E-1F31-4473-8B68-A745A43AF179}.Debug|x64.Build.0 = Debug|Any CPU
+		{60BE029E-1F31-4473-8B68-A745A43AF179}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60BE029E-1F31-4473-8B68-A745A43AF179}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60BE029E-1F31-4473-8B68-A745A43AF179}.Release|x64.ActiveCfg = Release|Any CPU
+		{60BE029E-1F31-4473-8B68-A745A43AF179}.Release|x64.Build.0 = Release|Any CPU
+		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{A2C8730A-B605-483E-914E-61F3ED7954D9}.Release|x64.Build.0 = Release|Any CPU
+		{8BBED205-C34E-4226-8757-0B576132D2BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BBED205-C34E-4226-8757-0B576132D2BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BBED205-C34E-4226-8757-0B576132D2BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8BBED205-C34E-4226-8757-0B576132D2BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{8BBED205-C34E-4226-8757-0B576132D2BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8BBED205-C34E-4226-8757-0B576132D2BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BBED205-C34E-4226-8757-0B576132D2BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{8BBED205-C34E-4226-8757-0B576132D2BC}.Release|x64.Build.0 = Release|Any CPU
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Debug|x64.Build.0 = Debug|Any CPU
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Release|x64.ActiveCfg = Release|Any CPU
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8}.Release|x64.Build.0 = Release|Any CPU
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Debug|x64.Build.0 = Debug|Any CPU
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|x64.ActiveCfg = Release|Any CPU
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}.Release|x64.Build.0 = Release|Any CPU
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Debug|x64.Build.0 = Debug|Any CPU
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Release|x64.ActiveCfg = Release|Any CPU
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59}.Release|x64.Build.0 = Release|Any CPU
+		{3DF12639-78B6-41B3-A046-A675035369BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DF12639-78B6-41B3-A046-A675035369BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DF12639-78B6-41B3-A046-A675035369BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DF12639-78B6-41B3-A046-A675035369BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{3DF12639-78B6-41B3-A046-A675035369BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DF12639-78B6-41B3-A046-A675035369BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DF12639-78B6-41B3-A046-A675035369BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{3DF12639-78B6-41B3-A046-A675035369BE}.Release|x64.Build.0 = Release|Any CPU
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Debug|x64.Build.0 = Debug|Any CPU
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Release|x64.ActiveCfg = Release|Any CPU
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84}.Release|x64.Build.0 = Release|Any CPU
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Debug|x64.Build.0 = Debug|Any CPU
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Release|x64.ActiveCfg = Release|Any CPU
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F}.Release|x64.Build.0 = Release|Any CPU
+		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Debug|x64.Build.0 = Debug|Any CPU
+		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{78573ADC-87A5-489F-8134-FB4A435A05F0}.Release|x64.Build.0 = Release|Any CPU
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE}.Release|x64.Build.0 = Release|Any CPU
+		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Debug|x64.Build.0 = Debug|Any CPU
+		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|x64.ActiveCfg = Release|Any CPU
+		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|x64.Build.0 = Release|Any CPU
+		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF418256-8118-47B4-8386-A945946FB92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF418256-8118-47B4-8386-A945946FB92D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF418256-8118-47B4-8386-A945946FB92D}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF418256-8118-47B4-8386-A945946FB92D}.Release|x64.Build.0 = Release|Any CPU
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Debug|x64.Build.0 = Debug|Any CPU
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Release|x64.ActiveCfg = Release|Any CPU
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B}.Release|x64.Build.0 = Release|Any CPU
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Debug|x64.Build.0 = Debug|Any CPU
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Release|Any CPU.Build.0 = Release|Any CPU
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Release|x64.ActiveCfg = Release|Any CPU
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469}.Release|x64.Build.0 = Release|Any CPU
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Debug|x64.Build.0 = Debug|Any CPU
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Release|x64.ActiveCfg = Release|Any CPU
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09}.Release|x64.Build.0 = Release|Any CPU
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Debug|x64.Build.0 = Debug|Any CPU
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Release|x64.ActiveCfg = Release|Any CPU
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554}.Release|x64.Build.0 = Release|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|x64.Build.0 = Release|Any CPU
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Debug|x64.Build.0 = Debug|Any CPU
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Release|x64.ActiveCfg = Release|Any CPU
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55}.Release|x64.Build.0 = Release|Any CPU
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Debug|x64.Build.0 = Debug|Any CPU
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Release|x64.ActiveCfg = Release|Any CPU
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6}.Release|x64.Build.0 = Release|Any CPU
+		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|x64.Build.0 = Debug|Any CPU
+		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|x64.ActiveCfg = Release|Any CPU
+		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|x64.Build.0 = Release|Any CPU
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|x64.Build.0 = Debug|Any CPU
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|x64.ActiveCfg = Release|Any CPU
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|x64.Build.0 = Release|Any CPU
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Debug|x64.Build.0 = Debug|Any CPU
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Release|x64.ActiveCfg = Release|Any CPU
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21}.Release|x64.Build.0 = Release|Any CPU
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Debug|x64.Build.0 = Debug|Any CPU
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Release|x64.ActiveCfg = Release|Any CPU
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE}.Release|x64.Build.0 = Release|Any CPU
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Debug|x64.Build.0 = Debug|Any CPU
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Release|x64.ActiveCfg = Release|Any CPU
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD}.Release|x64.Build.0 = Release|Any CPU
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9}.Release|x64.Build.0 = Release|Any CPU
+		{FC044D89-0FF3-441D-B35D-87454A693C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC044D89-0FF3-441D-B35D-87454A693C16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC044D89-0FF3-441D-B35D-87454A693C16}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FC044D89-0FF3-441D-B35D-87454A693C16}.Debug|x64.Build.0 = Debug|Any CPU
+		{FC044D89-0FF3-441D-B35D-87454A693C16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC044D89-0FF3-441D-B35D-87454A693C16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC044D89-0FF3-441D-B35D-87454A693C16}.Release|x64.ActiveCfg = Release|Any CPU
+		{FC044D89-0FF3-441D-B35D-87454A693C16}.Release|x64.Build.0 = Release|Any CPU
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Debug|x64.Build.0 = Debug|Any CPU
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6}.Release|x64.Build.0 = Release|Any CPU
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Debug|x64.Build.0 = Debug|Any CPU
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Release|x64.ActiveCfg = Release|Any CPU
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0}.Release|x64.Build.0 = Release|Any CPU
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Debug|x64.Build.0 = Debug|Any CPU
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Release|x64.ActiveCfg = Release|Any CPU
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1}.Release|x64.Build.0 = Release|Any CPU
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Debug|x64.Build.0 = Debug|Any CPU
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Release|x64.ActiveCfg = Release|Any CPU
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8}.Release|x64.Build.0 = Release|Any CPU
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1}.Release|x64.Build.0 = Release|Any CPU
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Debug|x64.Build.0 = Debug|Any CPU
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Release|x64.ActiveCfg = Release|Any CPU
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D}.Release|x64.Build.0 = Release|Any CPU
+		{76937388-BC9E-4083-9D6E-59CC627E3804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76937388-BC9E-4083-9D6E-59CC627E3804}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76937388-BC9E-4083-9D6E-59CC627E3804}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76937388-BC9E-4083-9D6E-59CC627E3804}.Debug|x64.Build.0 = Debug|Any CPU
+		{76937388-BC9E-4083-9D6E-59CC627E3804}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76937388-BC9E-4083-9D6E-59CC627E3804}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76937388-BC9E-4083-9D6E-59CC627E3804}.Release|x64.ActiveCfg = Release|Any CPU
+		{76937388-BC9E-4083-9D6E-59CC627E3804}.Release|x64.Build.0 = Release|Any CPU
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Debug|x64.Build.0 = Debug|Any CPU
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Release|x64.ActiveCfg = Release|Any CPU
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809}.Release|x64.Build.0 = Release|Any CPU
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Debug|x64.Build.0 = Debug|Any CPU
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Release|x64.ActiveCfg = Release|Any CPU
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7}.Release|x64.Build.0 = Release|Any CPU
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Debug|x64.Build.0 = Debug|Any CPU
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Release|x64.ActiveCfg = Release|Any CPU
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A}.Release|x64.Build.0 = Release|Any CPU
+		{67157264-AAA5-46A8-A38B-16254B49B892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67157264-AAA5-46A8-A38B-16254B49B892}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67157264-AAA5-46A8-A38B-16254B49B892}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{67157264-AAA5-46A8-A38B-16254B49B892}.Debug|x64.Build.0 = Debug|Any CPU
+		{67157264-AAA5-46A8-A38B-16254B49B892}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67157264-AAA5-46A8-A38B-16254B49B892}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67157264-AAA5-46A8-A38B-16254B49B892}.Release|x64.ActiveCfg = Release|Any CPU
+		{67157264-AAA5-46A8-A38B-16254B49B892}.Release|x64.Build.0 = Release|Any CPU
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Debug|x64.Build.0 = Debug|Any CPU
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Release|x64.ActiveCfg = Release|Any CPU
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709}.Release|x64.Build.0 = Release|Any CPU
+		{C1D53822-B11F-4772-996E-1E6D485E0702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1D53822-B11F-4772-996E-1E6D485E0702}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1D53822-B11F-4772-996E-1E6D485E0702}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1D53822-B11F-4772-996E-1E6D485E0702}.Debug|x64.Build.0 = Debug|Any CPU
+		{C1D53822-B11F-4772-996E-1E6D485E0702}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1D53822-B11F-4772-996E-1E6D485E0702}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1D53822-B11F-4772-996E-1E6D485E0702}.Release|x64.ActiveCfg = Release|Any CPU
+		{C1D53822-B11F-4772-996E-1E6D485E0702}.Release|x64.Build.0 = Release|Any CPU
+		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{21223BA5-C6E8-405D-B581-106C4726EDC0}.Release|x64.Build.0 = Release|Any CPU
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Debug|x64.Build.0 = Debug|Any CPU
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Release|x64.ActiveCfg = Release|Any CPU
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832}.Release|x64.Build.0 = Release|Any CPU
+		{442116F3-0F4A-4136-894E-FF5F4295500B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{442116F3-0F4A-4136-894E-FF5F4295500B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{442116F3-0F4A-4136-894E-FF5F4295500B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{442116F3-0F4A-4136-894E-FF5F4295500B}.Debug|x64.Build.0 = Debug|Any CPU
+		{442116F3-0F4A-4136-894E-FF5F4295500B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{442116F3-0F4A-4136-894E-FF5F4295500B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{442116F3-0F4A-4136-894E-FF5F4295500B}.Release|x64.ActiveCfg = Release|Any CPU
+		{442116F3-0F4A-4136-894E-FF5F4295500B}.Release|x64.Build.0 = Release|Any CPU
+		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Debug|x64.Build.0 = Debug|Any CPU
+		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Release|Any CPU.Build.0 = Release|Any CPU
+		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Release|x64.ActiveCfg = Release|Any CPU
+		{907AED7A-719B-4157-8CC9-D21CB26E9243}.Release|x64.Build.0 = Release|Any CPU
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Debug|x64.Build.0 = Debug|Any CPU
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Release|x64.ActiveCfg = Release|Any CPU
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD}.Release|x64.Build.0 = Release|Any CPU
+		{81299D15-5788-414D-A962-1A568C251323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81299D15-5788-414D-A962-1A568C251323}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81299D15-5788-414D-A962-1A568C251323}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{81299D15-5788-414D-A962-1A568C251323}.Debug|x64.Build.0 = Debug|Any CPU
+		{81299D15-5788-414D-A962-1A568C251323}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81299D15-5788-414D-A962-1A568C251323}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81299D15-5788-414D-A962-1A568C251323}.Release|x64.ActiveCfg = Release|Any CPU
+		{81299D15-5788-414D-A962-1A568C251323}.Release|x64.Build.0 = Release|Any CPU
+		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Debug|x64.Build.0 = Debug|Any CPU
+		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Release|x64.ActiveCfg = Release|Any CPU
+		{9D188843-8841-4A76-A844-EFBE8E32EE05}.Release|x64.Build.0 = Release|Any CPU
+		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Debug|x64.Build.0 = Debug|Any CPU
+		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Release|x64.ActiveCfg = Release|Any CPU
+		{31E0C098-6813-4571-AB96-A245E0FC1C23}.Release|x64.Build.0 = Release|Any CPU
+		{C091E499-597D-4077-B83F-08E069091090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C091E499-597D-4077-B83F-08E069091090}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C091E499-597D-4077-B83F-08E069091090}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C091E499-597D-4077-B83F-08E069091090}.Debug|x64.Build.0 = Debug|Any CPU
+		{C091E499-597D-4077-B83F-08E069091090}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C091E499-597D-4077-B83F-08E069091090}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C091E499-597D-4077-B83F-08E069091090}.Release|x64.ActiveCfg = Release|Any CPU
+		{C091E499-597D-4077-B83F-08E069091090}.Release|x64.Build.0 = Release|Any CPU
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Debug|x64.Build.0 = Debug|Any CPU
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Release|x64.ActiveCfg = Release|Any CPU
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73}.Release|x64.Build.0 = Release|Any CPU
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Debug|x64.Build.0 = Debug|Any CPU
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Release|x64.ActiveCfg = Release|Any CPU
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A}.Release|x64.Build.0 = Release|Any CPU
+		{D163D710-B946-4D50-8833-BD8B9941033A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D163D710-B946-4D50-8833-BD8B9941033A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D163D710-B946-4D50-8833-BD8B9941033A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D163D710-B946-4D50-8833-BD8B9941033A}.Debug|x64.Build.0 = Debug|Any CPU
+		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|x64.ActiveCfg = Release|Any CPU
+		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|x64.Build.0 = Release|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|x64.Build.0 = Release|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|x64.Build.0 = Debug|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|x64.ActiveCfg = Release|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|x64.Build.0 = Release|Any CPU
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|x64.Build.0 = Debug|Any CPU
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|x64.ActiveCfg = Release|Any CPU
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|x64.Build.0 = Release|Any CPU
+		{3D066801-9823-48ED-8FB3-273B53825808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D066801-9823-48ED-8FB3-273B53825808}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D066801-9823-48ED-8FB3-273B53825808}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D066801-9823-48ED-8FB3-273B53825808}.Debug|x64.Build.0 = Debug|Any CPU
+		{3D066801-9823-48ED-8FB3-273B53825808}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D066801-9823-48ED-8FB3-273B53825808}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D066801-9823-48ED-8FB3-273B53825808}.Release|x64.ActiveCfg = Release|Any CPU
+		{3D066801-9823-48ED-8FB3-273B53825808}.Release|x64.Build.0 = Release|Any CPU
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|x64.ActiveCfg = Release|Any CPU
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|x64.Build.0 = Release|Any CPU
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|x64.Build.0 = Debug|Any CPU
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|Any CPU.Build.0 = Release|Any CPU
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|x64.ActiveCfg = Release|Any CPU
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|x64.Build.0 = Release|Any CPU
+		{4DBF45EE-3BCE-47F4-B399-963B36A31951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DBF45EE-3BCE-47F4-B399-963B36A31951}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DBF45EE-3BCE-47F4-B399-963B36A31951}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4DBF45EE-3BCE-47F4-B399-963B36A31951}.Debug|x64.Build.0 = Debug|Any CPU
+		{4DBF45EE-3BCE-47F4-B399-963B36A31951}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DBF45EE-3BCE-47F4-B399-963B36A31951}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DBF45EE-3BCE-47F4-B399-963B36A31951}.Release|x64.ActiveCfg = Release|Any CPU
+		{4DBF45EE-3BCE-47F4-B399-963B36A31951}.Release|x64.Build.0 = Release|Any CPU
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Debug|x64.Build.0 = Debug|Any CPU
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Release|x64.ActiveCfg = Release|Any CPU
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE}.Release|x64.Build.0 = Release|Any CPU
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Debug|x64.Build.0 = Debug|Any CPU
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Release|x64.ActiveCfg = Release|Any CPU
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1}.Release|x64.Build.0 = Release|Any CPU
+		{CC790553-8088-41A9-83CD-B29F7141F408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC790553-8088-41A9-83CD-B29F7141F408}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC790553-8088-41A9-83CD-B29F7141F408}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC790553-8088-41A9-83CD-B29F7141F408}.Debug|x64.Build.0 = Debug|Any CPU
+		{CC790553-8088-41A9-83CD-B29F7141F408}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC790553-8088-41A9-83CD-B29F7141F408}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC790553-8088-41A9-83CD-B29F7141F408}.Release|x64.ActiveCfg = Release|Any CPU
+		{CC790553-8088-41A9-83CD-B29F7141F408}.Release|x64.Build.0 = Release|Any CPU
+		{4BED69F3-5835-4224-BD2C-50FA65C11395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BED69F3-5835-4224-BD2C-50FA65C11395}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BED69F3-5835-4224-BD2C-50FA65C11395}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4BED69F3-5835-4224-BD2C-50FA65C11395}.Debug|x64.Build.0 = Debug|Any CPU
+		{4BED69F3-5835-4224-BD2C-50FA65C11395}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BED69F3-5835-4224-BD2C-50FA65C11395}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BED69F3-5835-4224-BD2C-50FA65C11395}.Release|x64.ActiveCfg = Release|Any CPU
+		{4BED69F3-5835-4224-BD2C-50FA65C11395}.Release|x64.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CB6F8F77-4487-469B-896A-1EEEC4451A04} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{61A977EE-10DA-47F2-8BD9-3CC7BBB6904F} = {CB6F8F77-4487-469B-896A-1EEEC4451A04}
+		{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A} = {CB6F8F77-4487-469B-896A-1EEEC4451A04}
+		{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906} = {CB6F8F77-4487-469B-896A-1EEEC4451A04}
+		{109B3382-634B-408A-8A5C-4CD09CB92641} = {9461B162-AD2F-4F60-BCE4-E72DCEFD4608}
+		{A97C3046-2D55-4C49-AB40-A3C2194B82FA} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
+		{60BE029E-1F31-4473-8B68-A745A43AF179} = {E3916A0F-68D5-4C84-ACAE-41547F75E454}
+		{8BBED205-C34E-4226-8757-0B576132D2BC} = {DC6BE73D-4D60-4F90-9778-D44151CD6F98}
+		{8FA5494A-D651-4C80-9B69-EB1808CF64F8} = {DC6BE73D-4D60-4F90-9778-D44151CD6F98}
+		{4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D} = {E3916A0F-68D5-4C84-ACAE-41547F75E454}
+		{42A86931-7497-4A34-B2FD-060231CD0A8F} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
+		{5FD0D810-03E9-4FD2-93E4-B1B51E5D82C5} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
+		{925C0BF6-A0B1-4699-9C4B-078E01D652CC} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
+		{2DCD648D-DCA5-4D2A-8B14-AD2CB85D24B0} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
+		{F0DD5C38-083B-43EA-8654-96247028D8AC} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
+		{5BAB09DC-B0FC-4004-9FD5-6496A9634071} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
+		{AACD5D91-99F1-4E69-B23B-E25239E5FB59} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
+		{3DF12639-78B6-41B3-A046-A675035369BE} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
+		{890F3257-FCC2-4ED8-9180-22B3641B494C} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{58A88F1A-7489-46D2-949D-2FC3F68C8D84} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
+		{B47492D9-2EDA-4016-A930-7FA708C85C3D} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
+		{AD10C167-937F-4706-9EB5-C99F86C35E8F} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
+		{BE521908-7944-46F3-98BF-B47D34509934} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
+		{78573ADC-87A5-489F-8134-FB4A435A05F0} = {BE521908-7944-46F3-98BF-B47D34509934}
+		{2D0F9F8A-2E89-4780-978A-CD92D6D7B843} = {BE521908-7944-46F3-98BF-B47D34509934}
+		{D9F443B5-C55B-4AD8-9C70-BC3D2BE781BE} = {BE521908-7944-46F3-98BF-B47D34509934}
+		{8A53B084-20D8-48F6-9591-9D53CFA74130} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
+		{EF418256-8118-47B4-8386-A945946FB92D} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
+		{FF1793E1-77F5-4A92-B3F2-6D8B104E479B} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
+		{464F2220-D7D9-4D8C-BB3D-B93A1C603469} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
+		{50BC1552-3E7E-4C77-AC3A-AA7C572DFE09} = {BE521908-7944-46F3-98BF-B47D34509934}
+		{8581B4BB-A8BC-4328-99FE-D18615AF2554} = {BE521908-7944-46F3-98BF-B47D34509934}
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067} = {9461B162-AD2F-4F60-BCE4-E72DCEFD4608}
+		{1FD850CA-A8D7-41DC-9316-B315800437E1} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
+		{3CDEF4CC-2CFA-4939-8427-3ED00FA9DB55} = {1FD850CA-A8D7-41DC-9316-B315800437E1}
+		{26ECA1BE-F5B2-4A41-9658-46A4A917BFE6} = {1FD850CA-A8D7-41DC-9316-B315800437E1}
+		{B74CB8C1-187B-46A6-B20B-92B8C129F3EE} = {1FD850CA-A8D7-41DC-9316-B315800437E1}
+		{9461B162-AD2F-4F60-BCE4-E72DCEFD4608} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{E94E7327-5A9B-48EE-93CC-E9E9A5B980F1} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{D648BB69-B992-4D34-906E-7A547374B86C} = {E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}
+		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4} = {E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}
+		{B7376EC8-5D3E-47D2-96A7-748552F14C39} = {E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}
+		{6185B1A1-0A12-44B1-8AC5-0ED48147FB21} = {85C30B55-E486-49AE-B3F5-6A196D14CCB8}
+		{85C30B55-E486-49AE-B3F5-6A196D14CCB8} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
+		{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
+		{0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{0420D74A-2997-4B92-844B-C3769DEAA1AD} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
+		{372D9F0F-EDE9-4050-BF8C-758911C5C2E0} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
+		{A3A0EE09-6055-4009-AB8E-13FBC1A403A9} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
+		{FC044D89-0FF3-441D-B35D-87454A693C16} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
+		{57BF94A8-8F73-4D1A-91D2-B10CC64178B6} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
+		{B9D189AE-B0AE-49BC-A0A5-ACF87C849615} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
+		{BD2287FA-8272-4D14-9A26-889092AEBFE0} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
+		{208B25E4-2D0E-4534-B197-4C5C96CC53CE} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
+		{FFBC46F0-1874-42E9-8270-BBF962EF32D1} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
+		{C96D609B-B210-401C-8FFC-5D17F324E9E8} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
+		{CC10BBC6-09DA-4BBB-AE92-3F6097A022F1} = {B9D189AE-B0AE-49BC-A0A5-ACF87C849615}
+		{D1D0F986-12BE-4FD5-8925-C96B1F86427D} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
+		{76937388-BC9E-4083-9D6E-59CC627E3804} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
+		{C21A6553-B4EC-4EC3-B82A-C7A83CFFB809} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
+		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
+		{18C8730C-0173-4987-9416-46F86EC20541} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{28E2EA7F-FFD1-4E13-9165-0243B5AC82F5} = {18C8730C-0173-4987-9416-46F86EC20541}
+		{3AF1EF30-0906-4926-A02C-4E3AD666352A} = {18C8730C-0173-4987-9416-46F86EC20541}
+		{67157264-AAA5-46A8-A38B-16254B49B892} = {18C8730C-0173-4987-9416-46F86EC20541}
+		{5D988C50-8E85-402A-9020-A4AB0565F0C9} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
+		{02A24DD8-E0CA-4657-BAA7-B033A4563709} = {5D988C50-8E85-402A-9020-A4AB0565F0C9}
+		{C1D53822-B11F-4772-996E-1E6D485E0702} = {5D988C50-8E85-402A-9020-A4AB0565F0C9}
+		{7FFDAB72-145D-4490-9892-FAC5F1D72B17} = {5D988C50-8E85-402A-9020-A4AB0565F0C9}
+		{7E702AF1-3A72-454D-BE04-D2AF4EF1304B} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
+		{21223BA5-C6E8-405D-B581-106C4726EDC0} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
+		{5BBDE14E-50F8-4D6E-8E35-747667AD4A09} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
+		{D06F557C-452A-4BBE-9B79-A10DB03F3832} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
+		{442116F3-0F4A-4136-894E-FF5F4295500B} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
+		{907AED7A-719B-4157-8CC9-D21CB26E9243} = {7E702AF1-3A72-454D-BE04-D2AF4EF1304B}
+		{11C013F3-2583-4292-938B-707294DAECE1} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{23BE6E54-96C1-4373-89F3-E18A1C9807FD} = {11C013F3-2583-4292-938B-707294DAECE1}
+		{61374CD0-E774-4DCD-BFAB-6356B0931283} = {11C013F3-2583-4292-938B-707294DAECE1}
+		{81299D15-5788-414D-A962-1A568C251323} = {11C013F3-2583-4292-938B-707294DAECE1}
+		{9D188843-8841-4A76-A844-EFBE8E32EE05} = {11C013F3-2583-4292-938B-707294DAECE1}
+		{31E0C098-6813-4571-AB96-A245E0FC1C23} = {11C013F3-2583-4292-938B-707294DAECE1}
+		{C091E499-597D-4077-B83F-08E069091090} = {11C013F3-2583-4292-938B-707294DAECE1}
+		{C59939F6-D383-44E3-A7EF-4E160E3DFB73} = {11C013F3-2583-4292-938B-707294DAECE1}
+		{586A5A37-93F6-427E-8DF8-C10DB4D6822A} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
+		{DF1B3505-793C-4073-975B-04C81CC3CDC4} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{D163D710-B946-4D50-8833-BD8B9941033A} = {DF1B3505-793C-4073-975B-04C81CC3CDC4}
+		{F4BFB155-7BA9-4E46-8240-9C825060C904} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
+		{59764E6A-8366-4AF3-AB0A-BA28BD0318FA} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
+		{BDBB6B68-1DF8-4C41-B4AD-55037F81543D} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
+		{3D066801-9823-48ED-8FB3-273B53825808} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
+		{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
+		{050E8BAB-773E-4FE6-BD38-F71CF65FC257} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
+		{AAA05C3D-856D-4F22-971E-5E3F066D0EAE} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
+		{67A463D3-E98B-4B16-B069-D7BBB05386A1} = {F0DD5C38-083B-43EA-8654-96247028D8AC}
+		{CC790553-8088-41A9-83CD-B29F7141F408} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
+		{4BED69F3-5835-4224-BD2C-50FA65C11395} = {E3916A0F-68D5-4C84-ACAE-41547F75E454}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14}
+	EndGlobalSection
+EndGlobal
diff --git a/ConnectorArchicad/AddOn/.vscode/tasks.json b/ConnectorArchicad/AddOn/.vscode/tasks.json
index 1e9d8a7f49..c051ffa006 100644
--- a/ConnectorArchicad/AddOn/.vscode/tasks.json
+++ b/ConnectorArchicad/AddOn/.vscode/tasks.json
@@ -1,24 +1,22 @@
 {
   "version": "2.0.0",
-  "tasks": [
+  "tasks": [ 
     {
-      "label": "cmake build AddOn", // not tested on mac - may not work!
+      "label": "Speckle Archicad cmake 26",
       "type": "shell",
       "command": "cmake -G 'Xcode' -DCMAKE_OSX_ARCHITECTURES=x86_64 -DAC_API_DEVKIT_DIR='../../../../../../Dependencies/SDKs/ARCHICAD/APIDevKit25/macOS' ..",
       "windows": {
-        "command": "cmake -B ./Build/ -DAC_API_DEVKIT_DIR='C:/Program Files/GRAPHISOFT/API Development Kit 25.3002'"
+        "command": "if (!(Test-Path Build.Win.x64.26 -PathType Container)) {New-Item -ItemType Directory -Force -Path Build.Win.x64.26} ; cmake -B ./Build.Win.x64.26 -A \"x64\" -T \"v142\" -DAC_API_DEVKIT_DIR='../../../../../Dependencies/SDKs/Archicad/APIDevKit26/Win' -DAC_MDID_DEV=860313445 -DAC_MDID_LOC=2324968578"
       },
       "problemMatcher": []
     },
     {
-      "label": "msbuild AddOn",
-      "type": "shell",
-      "command": "'C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Current/Bin/MSBuild.exe' 'Build/Speckle Connector.sln' -property:Configuration=Release"
-    },
-    {
-      "label": "copy AddOn build files (win)",
-      "type": "shell",
-      "command": "cp -a ./Build/Debug/. 'C:/Program Files/GRAPHISOFT/ARCHICAD 25/Add-Ons/ConnectorArchicad'",
+      "label": "Speckle Archicad build 26",
+      "type": "process",
+      "windows": {
+        "command": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\MSBuild.exe",
+        "args": [".\\Build.Win.x64.26\\Speckle Connector.sln", "-property:Configuration=Release"]
+      },
       "problemMatcher": []
     },
   ]
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/AddOnMain.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/AddOnMain.cpp
index eb445f177f..94f0338fad 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/AddOnMain.cpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/AddOnMain.cpp
@@ -7,14 +7,19 @@
 #include "FileSystem.hpp"
 
 #include "Commands/GetModelForElements.hpp"
-#include "Commands/GetSelectedApplicationIds.hpp"
+#include "Commands/GetElementIds.hpp"
 #include "Commands/GetElementTypes.hpp"
 #include "Commands/GetWallData.hpp"
+#include "Commands/GetDoorData.hpp"
+#include "Commands/GetWindowData.hpp"
 #include "Commands/GetBeamData.hpp"
 #include "Commands/GetSlabData.hpp"
 #include "Commands/GetRoomData.hpp"
 #include "Commands/GetProjectInfo.hpp"
+#include "Commands/GetSubElementInfo.hpp"
 #include "Commands/CreateWall.hpp"
+#include "Commands/CreateDoor.hpp"
+#include "Commands/CreateWindow.hpp"
 #include "Commands/CreateBeam.hpp"
 #include "Commands/CreateSlab.hpp"
 #include "Commands/CreateZone.hpp"
@@ -75,7 +80,6 @@ class AvaloniaProcessManager {
 #endif
     static const char* FolderName = "ConnectorArchicad";
 
-
     IO::Location ownFileLoc;
     auto err = ACAPI_GetOwnLocation(&ownFileLoc);
     if (err != NoError) {
@@ -158,14 +162,19 @@ static GSErrCode MenuCommandHandler(const API_MenuParams* menuParams)
 static GSErrCode RegisterAddOnCommands()
 {
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetModelForElements>()));
-  CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetSelectedApplicationIds>()));
+  CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetElementIds>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetElementTypes>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetWallData>()));
+  CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetDoorData>()));
+  CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetWindowData>()));
+  CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetSubElementInfo>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetBeamData>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetRoomData>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetSlabData>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::GetProjectInfo>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::CreateWall>()));
+  CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::CreateDoor>()));
+  CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::CreateWindow>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::CreateBeam>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::CreateSlab>()));
   CHECKERROR(ACAPI_Install_AddOnCommandHandler(NewOwned<AddOnCommands::CreateZone>()));
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateDoor.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateDoor.cpp
new file mode 100644
index 0000000000..1d7e22d8f0
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateDoor.cpp
@@ -0,0 +1,184 @@
+#include "CreateDoor.hpp"
+#include "CreateOpeningBase.hpp"
+#include "ResourceIds.hpp"
+#include "ObjectState.hpp"
+#include "Utility.hpp"
+#include "Objects/Point.hpp"
+#include "RealNumber.h"
+#include "DGModule.hpp"
+#include "FieldNames.hpp"
+#include "TypeNameTables.hpp"
+#include "Database.hpp"
+
+
+namespace AddOnCommands
+{
+  static GSErrCode CreateNewDoor(API_Element& element, API_ElementMemo& memo, API_SubElement& marker)
+  {
+    return ACAPI_Element_CreateExt(&element, &memo, 1UL, &marker);
+  }
+
+  static GSErrCode ModifyExistingDoor(API_Element& door, API_Element& mask)
+  {
+    return ACAPI_Element_ChangeExt(&door, &mask, nullptr, 0, 0, nullptr, true, 0);
+  }
+
+  static GSErrCode GetDoorFromObjectState(const GS::ObjectState& currentDoor, API_Element& element, API_Element& wallMask, API_ElementMemo& memo, API_SubElement& marker) {
+    GSErrCode err = NoError;
+
+#ifdef ServerMainVers_2600
+    element.header.type = API_DoorID;
+#else
+    element.header.typeID = API_DoorID;
+#endif
+    
+    marker.subType = APISubElement_MainMarker;
+
+    err = ACAPI_Element_GetDefaultsExt(&element, &memo, 1UL, &marker);
+    if (err != NoError) {
+      ACAPI_DisposeElemMemoHdls(&memo);
+      ACAPI_DisposeElemMemoHdls(&marker.memo);
+      return err;
+    }
+
+#pragma region ReviewRequired
+    API_LibPart libPart;
+	BNZeroMemory (&libPart, sizeof (API_LibPart));
+
+#ifdef ServerMainVers_2600
+	err = ACAPI_Goodies_GetMarkerParent (element.header.type, libPart);
+#else
+    err = ACAPI_Goodies (APIAny_GetMarkerParentID, &element.header.typeID, &libPart);
+#endif
+
+    if (err != NoError) {
+      ACAPI_DisposeElemMemoHdls (&memo);
+      ACAPI_DisposeElemMemoHdls (&marker.memo);
+      return err;
+    }
+    
+    err = ACAPI_LibPart_Search (&libPart, false, true);
+    if (err != NoError) {
+      ACAPI_DisposeElemMemoHdls (&memo);
+      ACAPI_DisposeElemMemoHdls (&marker.memo);
+      return err;
+    }
+    
+    delete libPart.location;
+    
+    double a = .0, b = .0;
+    Int32 addParNum = 0;
+    API_AddParType **markAddPars;
+    err = ACAPI_LibPart_GetParams (libPart.index, &a, &b, &addParNum, &markAddPars);
+    if (err != NoError) {
+      ACAPI_DisposeElemMemoHdls (&memo);
+      ACAPI_DisposeElemMemoHdls (&marker.memo);
+      return err;
+    }
+
+    marker.memo.params = markAddPars;
+#pragma endregion
+
+    GS::UniString guidString;
+    currentDoor.Get(ApplicationIdFieldName, guidString);
+    element.header.guid = APIGuidFromString(guidString.ToCStr());
+	  
+	err = GetOpeningBaseFromObjectState<API_DoorType> (currentDoor, element.door, wallMask);
+
+    return err;
+  }
+
+  GS::String CreateDoor::GetName() const
+  {
+    return CreateDoorCommandName;
+  }
+
+  GS::ObjectState CreateDoor::Execute(const GS::ObjectState& parameters, GS::ProcessControl& /*processControl*/) const
+  {
+    GS::ObjectState result;
+    GSErrCode err = NoError;
+
+    GS::Array<GS::ObjectState> subElements;
+    parameters.Get(SubElementsFieldName, subElements);
+
+    const auto& listAdder = result.AddList<GS::UniString>(ApplicationIdsFieldName);
+
+    ACAPI_CallUndoableCommand("CreateSpeckleDoor", [&]() -> GSErrCode
+      {
+        Utility::Database db;
+        db.SwitchToFloorPlan();
+
+        for (const GS::ObjectState& subElement : subElements)
+        {
+          API_Element element = {};
+
+          // Check if parent exist
+          GS::UniString parentGuidString;
+          subElement.Get(ParentElementIdFieldName, parentGuidString);
+          API_Guid parentGuid = APIGuidFromString(parentGuidString.ToCStr());
+
+#ifdef ServerMainVers_2600
+          element.header.type = API_WallID;
+#else
+          element.header.typeID = API_WallID;
+#endif
+          element.header.guid = parentGuid;
+          err = ACAPI_Element_Get(&element);
+          if (err != NoError) {
+            continue;
+          }
+
+          if (element.wall.type == APIWtyp_Poly) {
+            continue;
+          }
+
+          // This may be redundant, should test it
+          bool parentExists = Utility::ElementExists(parentGuid);
+          bool isParentWall = Utility::GetElementType(parentGuid) == API_WallID;
+          if (!(parentExists && isParentWall)) {
+            continue;
+          }
+
+          // Subelement
+          API_ElementMemo memo = {};
+          API_SubElement marker = {};
+          API_Element elementMask = {};
+
+          // Try to get subelement
+          err = GetDoorFromObjectState(subElement, element, elementMask, memo, marker);
+          if (err != NoError) {
+            ACAPI_DisposeElemMemoHdls(&memo);
+            ACAPI_DisposeElemMemoHdls(&marker.memo);
+            continue;
+          }
+
+          // Set its parent
+          element.door.owner = parentGuid;
+
+          // Update or create
+          bool doorExists = Utility::ElementExists(element.header.guid);
+          if (doorExists)
+          {
+            err = ModifyExistingDoor(element, elementMask);
+          }
+          else
+          {
+            err = CreateNewDoor(element, memo, marker);
+          }
+
+          if (err == NoError)
+          {
+            GS::UniString elemId = APIGuidToString(element.header.guid);
+            listAdder(elemId);
+          }
+
+          err = ACAPI_DisposeElemMemoHdls(&memo);
+          err = ACAPI_DisposeElemMemoHdls(&marker.memo);
+        }
+
+		return NoError;
+      });
+
+    return result;
+  }
+}
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateDoor.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateDoor.hpp
new file mode 100644
index 0000000000..5f6f9f1109
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateDoor.hpp
@@ -0,0 +1,23 @@
+#ifndef CREATE_DOOR_HPP
+#define CREATE_DOOR_HPP
+
+#include "BaseCommand.hpp"
+
+
+namespace AddOnCommands {
+
+
+	class CreateDoor : public BaseCommand {
+	public:
+		virtual GS::String							GetName() const override;
+		virtual GS::ObjectState						Execute(const GS::ObjectState& parameters, GS::ProcessControl& processControl) const override;
+#ifdef ServerMainVers_2600
+		virtual bool								IsProcessWindowVisible() const override { return true; }
+#endif
+	};
+
+
+}
+
+
+#endif //#define CREATE_DOOR_HPP
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateOpeningBase.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateOpeningBase.hpp
new file mode 100644
index 0000000000..113964930b
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateOpeningBase.hpp
@@ -0,0 +1,123 @@
+#ifndef CREATE_OPENINGBASE_HPP
+#define CREATE_OPENINGBASE_HPP
+
+// API
+#include "APIEnvir.h"
+#include "ACAPinc.h"
+
+#include "Objects/Point.hpp"
+#include "FieldNames.hpp"
+#include "TypeNameTables.hpp"
+
+// GSRoot
+#include "ObjectState.hpp"
+
+
+namespace AddOnCommands {
+
+
+template<typename T>
+GSErrCode GetOpeningBaseFromObjectState (const GS::ObjectState& os, T& element, API_Element& mask)
+{
+	GSErrCode err = NoError;
+
+	os.Get(OpeningBase::width, element.openingBase.width);
+	ACAPI_ELEMENT_MASK_SET(mask, T, openingBase.width);
+
+	os.Get(OpeningBase::height, element.openingBase.height);
+	ACAPI_ELEMENT_MASK_SET(mask, T, openingBase.height);
+
+	os.Get(OpeningBase::subFloorThickness, element.openingBase.subFloorThickness);
+	ACAPI_ELEMENT_MASK_SET(mask, T, openingBase.subFloorThickness);
+
+	os.Get(OpeningBase::reflected, element.openingBase.reflected);
+	ACAPI_ELEMENT_MASK_SET(mask, T, openingBase.reflected);
+
+	os.Get(OpeningBase::oSide, element.openingBase.oSide);
+	ACAPI_ELEMENT_MASK_SET(mask, T, openingBase.oSide);
+
+	os.Get(OpeningBase::refSide, element.openingBase.refSide);
+	ACAPI_ELEMENT_MASK_SET(mask, T, openingBase.refSide);
+
+	if (os.Contains(OpeningBase::buildingMaterial)) {
+	  GS::UniString attrName;
+	  os.Get(OpeningBase::buildingMaterial, attrName);
+
+	  if (!attrName.IsEmpty()) {
+		API_Attribute attrib;
+		BNZeroMemory(&attrib, sizeof(API_Attribute));
+		attrib.header.typeID = API_BuildingMaterialID;
+		CHCopyC(attrName.ToCStr(), attrib.header.name);
+		err = ACAPI_Attribute_Get(&attrib);
+
+		if (err == NoError)
+		  element.openingBase.mat = attrib.header.index;
+	  }
+	}
+	  
+	if (os.Contains(OpeningBase::libraryPart)) {
+	  GS::UniString libPartName;
+	  os.Get(OpeningBase::libraryPart, libPartName);
+
+		if (!libPartName.IsEmpty()) {
+		  API_LibPart libPart;
+		  BNZeroMemory (&libPart, sizeof (API_LibPart));
+		  GS::ucscpy (libPart.docu_UName, libPartName.ToUStr ());
+
+		  err = ACAPI_LibPart_Search (&libPart, false, true);
+		  if (err == NoError)
+			element.openingBase.libInd = libPart.index;
+	  }
+	}
+
+	os.Get(OpeningBase::revealDepthFromSide, element.revealDepthFromSide);
+	ACAPI_ELEMENT_MASK_SET(mask, T, revealDepthFromSide);
+
+	os.Get(OpeningBase::jambDepthHead, element.jambDepthHead);
+	ACAPI_ELEMENT_MASK_SET(mask, T, jambDepthHead);
+
+	os.Get(OpeningBase::jambDepth, element.jambDepth);
+	ACAPI_ELEMENT_MASK_SET(mask, T, jambDepth);
+
+	os.Get(OpeningBase::jambDepth2, element.jambDepth2);
+	ACAPI_ELEMENT_MASK_SET(mask, T, jambDepth2);
+
+	os.Get(OpeningBase::objLoc, element.objLoc);
+	ACAPI_ELEMENT_MASK_SET(mask, T, objLoc);
+
+	os.Get(OpeningBase::lower, element.lower);
+	ACAPI_ELEMENT_MASK_SET(mask, T, lower);
+
+	if (os.Contains(OpeningBase::directionType)) {
+	  API_WindowDoorDirectionTypes realDirectionTypeName = API_WDAssociativeToWall;
+	  GS::UniString directionTypeName;
+	  os.Get(OpeningBase::directionType, directionTypeName);
+
+	  GS::Optional<API_WindowDoorDirectionTypes> tmpDirectionTypeName = windowDoorDirectionTypeNames.FindValue(directionTypeName);
+	  if (tmpDirectionTypeName.HasValue())
+		realDirectionTypeName = tmpDirectionTypeName.Get();
+	  element.directionType = realDirectionTypeName;
+	  ACAPI_ELEMENT_MASK_SET(mask, T, directionType);
+	}
+
+	Objects::Point3D startPoint;
+	if (os.Contains(OpeningBase::startPoint))
+	  os.Get(OpeningBase::startPoint, startPoint);
+	element.startPoint = startPoint.ToAPI_Coord();
+	ACAPI_ELEMENT_MASK_SET(mask, T, startPoint);
+
+	Objects::Point3D dirVector;
+	if (os.Contains(OpeningBase::dirVector))
+	  os.Get(OpeningBase::dirVector, dirVector);
+	element.dirVector = dirVector.ToAPI_Coord();
+	ACAPI_ELEMENT_MASK_SET(mask, T, dirVector);
+
+	return err;
+}
+
+
+
+} // namespace AddOnCommands
+
+
+#endif // CREATE_OPENINGBASE_HPP
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWall.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWall.cpp
index 480e37facf..2831911405 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWall.cpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWall.cpp
@@ -191,6 +191,15 @@ namespace AddOnCommands
     if (os.Contains(Wall::InsideSlantAngleFieldName))
       os.Get(Wall::InsideSlantAngleFieldName, element.wall.slantBeta);
     ACAPI_ELEMENT_MASK_SET(wallMask, API_WallType, slantBeta);
+    
+    // Door & window
+    if (os.Contains(Wall::HasDoorFieldName))
+      os.Get(Wall::HasDoorFieldName, element.wall.hasDoor);
+    ACAPI_ELEMENT_MASK_SET(wallMask, API_WallType, hasDoor);
+
+    if (os.Contains(Wall::HasWindowFieldName))
+      os.Get(Wall::HasWindowFieldName, element.wall.hasWindow);
+    ACAPI_ELEMENT_MASK_SET(wallMask, API_WallType, hasWindow);
 
     return NoError;
   }
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWindow.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWindow.cpp
new file mode 100644
index 0000000000..2524c0fb02
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWindow.cpp
@@ -0,0 +1,182 @@
+#include "CreateWindow.hpp"
+#include "CreateOpeningBase.hpp"
+#include "ResourceIds.hpp"
+#include "ObjectState.hpp"
+#include "Utility.hpp"
+#include "Objects/Point.hpp"
+#include "RealNumber.h"
+#include "DGModule.hpp"
+#include "FieldNames.hpp"
+#include "TypeNameTables.hpp"
+#include "Database.hpp"
+
+
+namespace AddOnCommands
+{
+  static GSErrCode CreateNewWindow(API_Element& element, API_ElementMemo& memo, API_SubElement& marker)
+  {
+    return ACAPI_Element_CreateExt(&element, &memo, 1UL, &marker);
+  }
+
+  static GSErrCode ModifyExistingWindow(API_Element& Window, API_Element& mask)
+  {
+    return ACAPI_Element_ChangeExt(&Window, &mask, nullptr, 0, 0, nullptr, true, 0);
+  }
+
+  static GSErrCode GetWindowFromObjectState(const GS::ObjectState& currentWindow, API_Element& element, API_Element& wallMask, API_ElementMemo& memo, API_SubElement& marker) {
+    GSErrCode err = NoError;
+
+#ifdef ServerMainVers_2600
+    element.header.type = API_WindowID;
+#else
+	  element.header.typeID = API_WindowID;
+#endif
+    marker.subType = APISubElement_MainMarker;
+
+    err = ACAPI_Element_GetDefaultsExt(&element, &memo, 1UL, &marker);
+    if (err != NoError) {
+      ACAPI_DisposeElemMemoHdls(&memo);
+      ACAPI_DisposeElemMemoHdls(&marker.memo);
+      return err;
+    }
+
+#pragma region ReviewRequired
+    API_LibPart libPart;
+    BNZeroMemory(&libPart, sizeof(API_LibPart));
+
+#ifdef ServerMainVers_2600
+	err = ACAPI_Goodies_GetMarkerParent (element.header.type, libPart);
+#else
+	err = ACAPI_Goodies (APIAny_GetMarkerParentID, &element.header.typeID, &libPart);
+#endif
+    if (err != NoError) {
+      ACAPI_DisposeElemMemoHdls(&memo);
+      ACAPI_DisposeElemMemoHdls(&marker.memo);
+      return err;
+    }
+
+    err = ACAPI_LibPart_Search(&libPart, false, true);
+    if (err != NoError) {
+      ACAPI_DisposeElemMemoHdls(&memo);
+      ACAPI_DisposeElemMemoHdls(&marker.memo);
+      return err;
+    }
+
+    delete libPart.location;
+
+    double a = .0, b = .0;
+    Int32 addParNum = 0;
+    API_AddParType** markAddPars;
+    err = ACAPI_LibPart_GetParams(libPart.index, &a, &b, &addParNum, &markAddPars);
+    if (err != NoError) {
+      ACAPI_DisposeElemMemoHdls(&memo);
+      ACAPI_DisposeElemMemoHdls(&marker.memo);
+      return err;
+    }
+
+    marker.memo.params = markAddPars;
+#pragma endregion
+
+    GS::UniString guidString;
+    currentWindow.Get(ApplicationIdFieldName, guidString);
+    element.header.guid = APIGuidFromString(guidString.ToCStr());
+	  
+    err = GetOpeningBaseFromObjectState<API_WindowType> (currentWindow, element.window, wallMask);
+   
+    return err;
+  }
+
+  GS::String CreateWindow::GetName() const
+  {
+    return CreateWindowCommandName;
+  }
+
+  GS::ObjectState CreateWindow::Execute(const GS::ObjectState& parameters, GS::ProcessControl& /*processControl*/) const
+  {
+    GS::ObjectState result;
+    GSErrCode err = NoError;
+
+    GS::Array<GS::ObjectState> subElements;
+    parameters.Get(SubElementsFieldName, subElements);
+
+    const auto& listAdder = result.AddList<GS::UniString>(ApplicationIdsFieldName);
+
+    ACAPI_CallUndoableCommand("CreateSpeckleWindow", [&]() -> GSErrCode
+      {
+        Utility::Database db;
+        db.SwitchToFloorPlan();
+
+        for (const GS::ObjectState& subElement : subElements)
+        {
+          API_Element element = {};
+
+          // Check if parent exist
+          GS::UniString parentGuidString;
+          subElement.Get(ParentElementIdFieldName, parentGuidString);
+          API_Guid parentGuid = APIGuidFromString(parentGuidString.ToCStr());
+
+#ifdef ServerMainVers_2600
+          element.header.type = API_WallID;
+#else
+          element.header.typeID = API_WallID;
+#endif
+          element.header.guid = parentGuid;
+          err = ACAPI_Element_Get(&element);
+          if (err != NoError) {
+            continue;
+          }
+
+          if (element.wall.type == APIWtyp_Poly) {
+            continue;
+          }
+
+          // This may be redundant, should test it
+          bool parentExists = Utility::ElementExists(parentGuid);
+          bool isParentWall = Utility::GetElementType(parentGuid) == API_WallID;
+          if (!(parentExists && isParentWall)) {
+            continue;
+          }
+
+          // Subelement
+          API_ElementMemo memo = {};
+          API_SubElement marker = {};
+          API_Element elementMask = {};
+
+          // Try to get subelement
+          err = GetWindowFromObjectState(subElement, element, elementMask, memo, marker);
+          if (err != NoError) {
+            ACAPI_DisposeElemMemoHdls(&memo);
+            ACAPI_DisposeElemMemoHdls(&marker.memo);
+            continue;
+          }
+
+          // Set its parent
+          element.window.owner = parentGuid;
+
+          // Update or create
+          bool WindowExists = Utility::ElementExists(element.header.guid);
+          if (WindowExists)
+          { 
+            err = ModifyExistingWindow(element, elementMask);
+          }
+          else
+          {
+            err = CreateNewWindow(element, memo, marker);
+          }
+
+          if (err == NoError)
+          {
+            GS::UniString elemId = APIGuidToString(element.header.guid);
+            listAdder(elemId);
+          }
+
+          err = ACAPI_DisposeElemMemoHdls(&memo);
+          err = ACAPI_DisposeElemMemoHdls(&marker.memo);
+        }
+
+        return NoError;
+      });
+
+    return result;
+  }
+}
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWindow.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWindow.hpp
new file mode 100644
index 0000000000..ca1f95092c
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWindow.hpp
@@ -0,0 +1,23 @@
+#ifndef CREATE_WINDOW_HPP
+#define CREATE_WINDOW_HPP
+
+#include "BaseCommand.hpp"
+
+
+namespace AddOnCommands {
+
+
+	class CreateWindow : public BaseCommand {
+	public:
+		virtual GS::String							GetName() const override;
+		virtual GS::ObjectState						Execute(const GS::ObjectState& parameters, GS::ProcessControl& processControl) const override;
+#ifdef ServerMainVers_2600
+		virtual bool								IsProcessWindowVisible() const override { return true; }
+#endif
+	};
+
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetDoorData.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetDoorData.cpp
new file mode 100644
index 0000000000..c5ae3af4a0
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetDoorData.cpp
@@ -0,0 +1,74 @@
+#include "GetDoorData.hpp"
+#include "GetOpeningBaseData.hpp"
+#include "ResourceIds.hpp"
+#include "ObjectState.hpp"
+#include "Utility.hpp"
+#include "Objects/Point.hpp"
+#include "RealNumber.h"
+#include "FieldNames.hpp"
+#include "TypeNameTables.hpp"
+
+
+namespace AddOnCommands {
+  static GS::ObjectState GetDoors(const API_Guid& guid) {
+    GSErrCode err = NoError;
+
+    GS::ObjectState currentDoor;
+    API_Element element;
+
+    BNZeroMemory(&element, sizeof(API_Element));
+    element.header.guid = guid;
+    err = ACAPI_Element_Get(&element);
+
+    if (err == NoError) {
+      currentDoor.Add(ApplicationIdFieldName, APIGuidToString(guid));
+      currentDoor.Add(ParentElementIdFieldName, APIGuidToString(element.door.owner));
+      
+	  AddOnCommands::GetOpeningBaseData<API_DoorType> (element.door, currentDoor);
+	}
+
+    return currentDoor;
+  }
+
+  GS::String GetDoorData::GetName () const {
+    return GetDoorCommandName;
+  }
+
+  GS::ObjectState GetDoorData::Execute (const GS::ObjectState& parameters, GS::ProcessControl& /*processControl*/) const {
+    GS::ObjectState result;
+
+    GS::Array<GS::UniString> ids;
+    parameters.Get(ApplicationIdsFieldName, ids);
+    GS::Array<API_Guid> elementGuids = ids.Transform<API_Guid>([](const GS::UniString& idStr)
+      { return APIGuidFromString(idStr.ToCStr()); });
+    
+    if (elementGuids.IsEmpty())
+      return result;
+
+    const auto& listAdderDoors = result.AddList<GS::ObjectState>(DoorsFieldName);
+
+    for (const API_Guid& guid : elementGuids)
+    {
+      API_Element element{};
+      element.header.guid = guid;
+
+      GSErrCode err = ACAPI_Element_Get(&element);
+
+      if (err != NoError /*|| element.header.type.typeID != API_WallID*/) {
+        return result;
+      }
+
+#ifdef ServerMainVers_2600
+        if (element.header.type.typeID == API_DoorID) {
+#else
+		if (element.header.typeID == API_DoorID) {
+#endif
+          GS::ObjectState door = GetDoors(element.header.guid);
+          listAdderDoors(door);
+        }
+      }
+
+    return result;
+  }
+
+}
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetDoorData.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetDoorData.hpp
new file mode 100644
index 0000000000..0439ecfc04
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetDoorData.hpp
@@ -0,0 +1,22 @@
+#ifndef GET_OPENING_DATA_HPP
+#define GET_OPENING_DATA_HPP
+
+#include "BaseCommand.hpp"
+
+namespace AddOnCommands {
+
+
+	class GetDoorData : public BaseCommand {
+	public:
+		virtual GS::String							GetName() const override;
+		virtual GS::ObjectState						Execute(const GS::ObjectState& parameters, GS::ProcessControl& processControl) const override;
+#ifdef ServerMainVers_2600
+		virtual bool								IsProcessWindowVisible() const override { return true; }
+#endif
+	};
+
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetElementIds.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetElementIds.cpp
new file mode 100644
index 0000000000..ee7e43f8b2
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetElementIds.cpp
@@ -0,0 +1,79 @@
+#include "GetElementIds.hpp"
+#include "ResourceIds.hpp"
+#include "ObjectState.hpp"
+#include "Utility.hpp"
+#include "FieldNames.hpp"
+
+
+namespace AddOnCommands {
+
+
+  static GS::Array<API_Guid> GetSelectedElementGuids()
+  {
+    GS::Array<API_Guid>		elementGuids;
+    API_SelectionInfo		selectionInfo;
+    GS::Array<API_Neig>		selNeigs;
+
+    GSErrCode err = ACAPI_Selection_Get(&selectionInfo, &selNeigs, true);
+    if (err == NoError) {
+      if (selectionInfo.typeID != API_SelEmpty) {
+        for (const API_Neig& neig : selNeigs) {
+          if (Utility::IsElement3D(neig.guid)) {
+            elementGuids.Push(neig.guid);
+          }
+        }
+      }
+    }
+
+    BMKillHandle((GSHandle*)&selectionInfo.marquee.coords);
+
+    return elementGuids;
+  }
+
+
+  static GS::Array<API_Guid> GetAllElementGuids()
+  {
+	GS::Array<API_Guid> elementGuids;
+	GS::Array<API_Guid> element3DGuids;
+	GSErrCode err = ACAPI_Element_GetElemList (API_ZombieElemID, &elementGuids, APIFilt_OnVisLayer | APIFilt_In3D);
+	if (err == NoError) {
+	  for (const API_Guid& guid : elementGuids) {
+		if (Utility::IsElement3D(guid)) {
+		  element3DGuids.Push(guid);
+		}
+	  }
+	}
+	
+    return element3DGuids;
+  }
+
+
+  GS::String GetElementIds::GetName() const
+  {
+    return GetElementIdsCommandName;
+  }
+
+
+  GS::ObjectState GetElementIds::Execute(const GS::ObjectState& parameters, GS::ProcessControl& /*processControl*/) const
+  {
+    GS::UniString elementFilter;
+    parameters.Get(ElementFilterFieldName, elementFilter);
+	
+	GS::ObjectState retVal;
+
+	GS::Array<API_Guid> elementGuids;
+	if (elementFilter == "Selection")
+		elementGuids = GetSelectedElementGuids();
+	else if (elementFilter == "All")
+		elementGuids = GetAllElementGuids();
+
+	const auto& listAdder = retVal.AddList<GS::UniString>(ApplicationIdsFieldName);
+    for (const API_Guid& guid : elementGuids) {
+	  listAdder(APIGuidToString(guid));
+    }
+
+    return retVal;
+  }
+
+
+}
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSelectedApplicationIds.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetElementIds.hpp
similarity index 88%
rename from ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSelectedApplicationIds.hpp
rename to ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetElementIds.hpp
index 0cfa18baa9..9f8ef3987b 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSelectedApplicationIds.hpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetElementIds.hpp
@@ -7,7 +7,7 @@
 namespace AddOnCommands {
 
 
-  class GetSelectedApplicationIds : public BaseCommand {
+  class GetElementIds : public BaseCommand {
   public:
     virtual GS::String							GetName() const override;
     virtual GS::ObjectState						Execute(const GS::ObjectState& parameters, GS::ProcessControl& processControl) const override;
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetOpeningBaseData.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetOpeningBaseData.hpp
new file mode 100644
index 0000000000..dc5b396a08
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetOpeningBaseData.hpp
@@ -0,0 +1,68 @@
+#ifndef GET_OPENINGBASE_DATA_HPP
+#define GET_OPENINGBASE_DATA_HPP
+
+// API
+#include "APIEnvir.h"
+#include "ACAPinc.h"
+
+#include "Objects/Point.hpp"
+#include "FieldNames.hpp"
+#include "TypeNameTables.hpp"
+
+// GSRoot
+#include "ObjectState.hpp"
+
+
+namespace AddOnCommands {
+
+
+template<typename T>
+GSErrCode GetOpeningBaseData (const T& element, GS::ObjectState& os)
+{
+	GSErrCode err = NoError;
+
+	os.Add(OpeningBase::width, element.openingBase.width);
+	os.Add(OpeningBase::height, element.openingBase.height);
+	os.Add(OpeningBase::subFloorThickness, element.openingBase.subFloorThickness);
+	os.Add(OpeningBase::reflected, element.openingBase.reflected);
+	os.Add(OpeningBase::oSide, element.openingBase.oSide);
+	os.Add(OpeningBase::refSide, element.openingBase.refSide);
+
+	{
+	  API_Attribute attrib;
+	  BNZeroMemory(&attrib, sizeof(API_Attribute));
+	  attrib.header.typeID = API_BuildingMaterialID;
+	  attrib.header.index = element.openingBase.mat;
+	  ACAPI_Attribute_Get(&attrib);
+	  os.Add(OpeningBase::buildingMaterial, GS::UniString{ attrib.header.name });
+	}
+
+	{
+	  API_LibPart libPart;
+	  BNZeroMemory (&libPart, sizeof (API_LibPart));
+	  libPart.index = element.openingBase.libInd;
+
+	  err = ACAPI_LibPart_Get (&libPart);
+	  if (err == NoError)
+		os.Add(OpeningBase::libraryPart, GS::UniString (libPart.docu_UName));
+	}
+
+	os.Add(OpeningBase::revealDepthFromSide, element.revealDepthFromSide);
+	os.Add(OpeningBase::jambDepthHead, element.jambDepthHead);
+	os.Add(OpeningBase::jambDepth, element.jambDepth);
+	os.Add(OpeningBase::jambDepth2, element.jambDepth2);
+	os.Add(OpeningBase::objLoc, element.objLoc);
+	os.Add(OpeningBase::lower, element.lower);
+	os.Add(OpeningBase::directionType, windowDoorDirectionTypeNames.Get(element.directionType));
+
+	os.Add(OpeningBase::startPoint, Objects::Point3D(element.startPoint.x, element.startPoint.y, 0));
+	os.Add(OpeningBase::dirVector, Objects::Point3D(element.dirVector.x, element.dirVector.y, 0));
+	
+	return err;
+}
+
+
+} // namespace AddOnCommands
+
+
+#endif // GET_OPENINGBASE_DATA_HPP
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSelectedApplicationIds.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSelectedApplicationIds.cpp
deleted file mode 100644
index c6daeda019..0000000000
--- a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSelectedApplicationIds.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "GetSelectedApplicationIds.hpp"
-#include "ResourceIds.hpp"
-#include "ObjectState.hpp"
-#include "Utility.hpp"
-#include "FieldNames.hpp"
-
-
-namespace AddOnCommands {
-
-
-  static GS::Array<API_Guid> GetSelectedElementGuids()
-  {
-    GS::Array<API_Guid>		elementGuids;
-    API_SelectionInfo		selectionInfo;
-    GS::Array<API_Neig>		selNeigs;
-
-    GSErrCode err = ACAPI_Selection_Get(&selectionInfo, &selNeigs, true);
-    if (err == NoError) {
-      if (selectionInfo.typeID != API_SelEmpty) {
-        for (const API_Neig& neig : selNeigs) {
-          if (Utility::IsElement3D(neig.guid)) {
-            elementGuids.Push(neig.guid);
-          }
-        }
-      }
-    }
-
-    BMKillHandle((GSHandle*)&selectionInfo.marquee.coords);
-
-    return elementGuids;
-  }
-
-
-  GS::String GetSelectedApplicationIds::GetName() const
-  {
-    return GetSelectedApplicationIdsCommandName;
-  }
-
-
-  GS::ObjectState GetSelectedApplicationIds::Execute(const GS::ObjectState& /*parameters*/, GS::ProcessControl& /*processControl*/) const
-  {
-
-    GS::Array<API_Guid>	elementGuids = GetSelectedElementGuids();
-
-    GS::ObjectState retVal;
-
-    const auto& listAdder = retVal.AddList<GS::UniString>(ApplicationIdsFieldName);
-    for (const API_Guid& guid : elementGuids) {
-      listAdder(APIGuidToString(guid));
-    }
-
-    return retVal;
-  }
-
-
-}
\ No newline at end of file
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSubElementInfo.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSubElementInfo.cpp
new file mode 100644
index 0000000000..ad9b9c1d9d
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSubElementInfo.cpp
@@ -0,0 +1,50 @@
+#include "GetSubElementInfo.hpp"
+#include "ResourceIds.hpp"
+#include "ObjectState.hpp"
+#include "Utility.hpp"
+#include "Objects/Point.hpp"
+#include "RealNumber.h"
+#include "FieldNames.hpp"
+#include "TypeNameTables.hpp"
+
+
+namespace AddOnCommands {
+
+  GS::String GetSubElementInfo::GetName () const {
+    return GetSubelementInfoCommandName;
+  }
+
+  GS::ObjectState GetSubElementInfo::Execute (const GS::ObjectState& parameters, GS::ProcessControl& /*processControl*/) const {
+    GSErrCode err = NoError;
+    GS::UniString id;
+    parameters.Get(ApplicationIdFieldName, id);
+    API_Guid wallGuid = APIGuidFromString(id.ToCStr());
+
+    GS::ObjectState result;
+    const auto& listAdder = result.AddList<GS::ObjectState>(SubelementModelsFieldName);
+
+    API_Element wallElement{};
+    wallElement.header.guid = wallGuid;
+    err = ACAPI_Element_Get(&wallElement);
+    
+    if (err == NoError) {
+      GS::Array<API_Guid> elementGuids = Utility::GetWallSubelements(wallElement.wall);
+      for (GS::UInt32 i = 0; i < elementGuids.GetSize(); i++)
+      {
+        API_Guid currentGuid = elementGuids.Get(i);
+
+        GS::UniString guid = APIGuidToString(currentGuid);
+        API_ElemTypeID elementTypeId = Utility::GetElementType(currentGuid);
+        GS::UniString elemType = elementNames.Get(elementTypeId);
+
+        GS::ObjectState subelementModel;
+        subelementModel.Add(ApplicationIdFieldName, guid);
+        subelementModel.Add(ElementTypeFieldName, elemType);
+        listAdder(subelementModel);
+      }
+    }
+ 
+    return result;
+  }
+
+}
\ No newline at end of file
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSubElementInfo.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSubElementInfo.hpp
new file mode 100644
index 0000000000..234780bdab
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetSubElementInfo.hpp
@@ -0,0 +1,22 @@
+#ifndef GET_SUBELEMENT_DATA_HPP
+#define GET_SUBELEMENT_DATA_HPP
+
+#include "BaseCommand.hpp"
+
+namespace AddOnCommands {
+
+
+	class GetSubElementInfo : public BaseCommand {
+	public:
+		virtual GS::String							GetName() const override;
+		virtual GS::ObjectState						Execute(const GS::ObjectState& parameters, GS::ProcessControl& processControl) const override;
+#ifdef ServerMainVers_2600
+		virtual bool								IsProcessWindowVisible() const override { return true; }
+#endif
+	};
+
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWallData.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWallData.cpp
index 4084f4ff5b..80621f1006 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWallData.cpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWallData.cpp
@@ -7,102 +7,97 @@
 #include "FieldNames.hpp"
 #include "TypeNameTables.hpp"
 
-namespace AddOnCommands
-{
+namespace AddOnCommands {
 
-  static GS::ObjectState SerializeWallType(const API_WallType& wall)
-  {
+  static GS::ObjectState SerializeWallType (const API_WallType& wall) {
     GS::ObjectState os;
 
     // The identifier of the wall
-    os.Add(ApplicationIdFieldName, APIGuidToString(wall.head.guid));
+    os.Add (ApplicationIdFieldName, APIGuidToString (wall.head.guid));
 
     // The index of the wall's floor
-    os.Add(FloorIndexFieldName, wall.head.floorInd);
+    os.Add (FloorIndexFieldName, wall.head.floorInd);
 
     // The start and end points of the wall
-    double z = Utility::GetStoryLevel(wall.head.floorInd) + wall.bottomOffset;
-    os.Add(Wall::StartPointFieldName, Objects::Point3D(wall.begC.x, wall.begC.y, z));
-    os.Add(Wall::EndPointFieldName, Objects::Point3D(wall.endC.x, wall.endC.y, z));
+    double z = Utility::GetStoryLevel (wall.head.floorInd) + wall.bottomOffset;
+    os.Add (Wall::StartPointFieldName, Objects::Point3D (wall.begC.x, wall.begC.y, z));
+    os.Add (Wall::EndPointFieldName, Objects::Point3D (wall.endC.x, wall.endC.y, z));
 
     // The arc angle of the wall
-    if (abs(wall.angle) > EPS)
-      os.Add(Wall::ArcAngleFieldName, wall.angle);
+    if (abs (wall.angle) > EPS)
+      os.Add (Wall::ArcAngleFieldName, wall.angle);
 
     // The parameters of the wall
-    os.Add(Wall::HeightFieldName, wall.height);
-    os.Add(Wall::BaseOffsetFieldName, wall.bottomOffset);
-    os.Add(Wall::TopOffsetFieldName, wall.topOffset);
-    os.Add(Wall::FlippedFieldName, wall.flipped);
+    os.Add (Wall::HeightFieldName, wall.height);
+    os.Add (Wall::BaseOffsetFieldName, wall.bottomOffset);
+    os.Add (Wall::TopOffsetFieldName, wall.topOffset);
+    os.Add (Wall::FlippedFieldName, wall.flipped);
 
     // The structure type of the wall (basic, composite or profiled)
-    os.Add(Wall::StructureFieldName, structureTypeNames.Get(wall.modelElemStructureType));
+    os.Add (Wall::StructureFieldName, structureTypeNames.Get (wall.modelElemStructureType));
 
     // The building material index, composite index or the profile index of the wall
-    switch (wall.modelElemStructureType)
-    {
+    switch (wall.modelElemStructureType) {
     case API_BasicStructure:
-      os.Add(Wall::BuildingMaterialIndexFieldName, wall.buildingMaterial);
+      os.Add (Wall::BuildingMaterialIndexFieldName, wall.buildingMaterial);
       break;
     case API_CompositeStructure:
-      os.Add(Wall::CompositeIndexFieldName, wall.composite);
+      os.Add (Wall::CompositeIndexFieldName, wall.composite);
       break;
     case API_ProfileStructure:
-      os.Add(Wall::ProfileIndexFieldName, wall.profileAttr);
+      os.Add (Wall::ProfileIndexFieldName, wall.profileAttr);
       break;
     default:
       break;
     }
 
     // The geometry method of the wall (straight, trapezoid or polygonal)
-    os.Add(Wall::GeometryMethodFieldName, wallTypeNames.Get(wall.type));
+    os.Add (Wall::GeometryMethodFieldName, wallTypeNames.Get (wall.type));
 
     // The profile type of the wall (straight, slanted, trapezoid or polygonal)
-    os.Add(Wall::WallComplexityFieldName, profileTypeNames.Get(wall.profileType));
+    os.Add (Wall::WallComplexityFieldName, profileTypeNames.Get (wall.profileType));
 
     // The thickness of the wall (first and second thickness for trapezoid walls)
-    if (wall.type == APIWtyp_Trapez)
-    {
-      os.Add(Wall::FirstThicknessFieldName, wall.thickness);
-      os.Add(Wall::SecondThicknessFieldName, wall.thickness1);
+    if (wall.type == APIWtyp_Trapez) {
+      os.Add (Wall::FirstThicknessFieldName, wall.thickness);
+      os.Add (Wall::SecondThicknessFieldName, wall.thickness1);
     }
-    else
-    {
-      os.Add(Wall::ThicknessFieldName, wall.thickness);
+    else {
+      os.Add (Wall::ThicknessFieldName, wall.thickness);
     }
 
     // The outside slant angle of the wall
-    os.Add(Wall::OutsideSlantAngleFieldName, wall.slantAlpha);
+    os.Add (Wall::OutsideSlantAngleFieldName, wall.slantAlpha);
 
     // The inside slant angle of the wall
     if (wall.profileType == APISect_Trapez)
-      os.Add(Wall::InsideSlantAngleFieldName, wall.slantBeta);
+      os.Add (Wall::InsideSlantAngleFieldName, wall.slantBeta);
 
+    // Does it have any embedded object?
+    os.Add(Wall::HasDoorFieldName, wall.hasDoor);
+    os.Add(Wall::HasWindowFieldName, wall.hasWindow);
+
+    // End
     return os;
   }
 
-  GS::String GetWallData::GetName() const
-  {
+  GS::String GetWallData::GetName () const {
     return GetWallDataCommandName;
   }
 
-  GS::ObjectState GetWallData::Execute(const GS::ObjectState& parameters, GS::ProcessControl& /*processControl*/) const
-  {
+  GS::ObjectState GetWallData::Execute (const GS::ObjectState& parameters, GS::ProcessControl& /*processControl*/) const {
     GS::Array<GS::UniString> ids;
-    parameters.Get(ApplicationIdsFieldName, ids);
-    GS::Array<API_Guid> elementGuids = ids.Transform<API_Guid>([](const GS::UniString& idStr)
-      { return APIGuidFromString(idStr.ToCStr()); });
+    parameters.Get (ApplicationIdsFieldName, ids);
+    GS::Array<API_Guid> elementGuids = ids.Transform<API_Guid> ([] (const GS::UniString& idStr) { return APIGuidFromString (idStr.ToCStr ()); });
 
     GS::ObjectState result;
-    const auto& listAdder = result.AddList<GS::ObjectState>(WallsFieldName);
-    for (const API_Guid& guid : elementGuids)
-    {
-      API_Element element{};
+    const auto& listAdder = result.AddList<GS::ObjectState> (WallsFieldName);
+    for (const API_Guid& guid : elementGuids) {
+      API_Element element {};
       element.header.guid = guid;
 
-      GSErrCode err = ACAPI_Element_Get(&element);
-      if (err != NoError)
-      {
+      GSErrCode err = ACAPI_Element_Get (&element);
+      if (err != NoError) {
         continue;
       }
 
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWindowData.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWindowData.cpp
new file mode 100644
index 0000000000..176bd58e3b
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWindowData.cpp
@@ -0,0 +1,76 @@
+#include "GetWindowData.hpp"
+#include "GetOpeningBaseData.hpp"
+#include "ResourceIds.hpp"
+#include "ObjectState.hpp"
+#include "Utility.hpp"
+#include "Objects/Point.hpp"
+#include "RealNumber.h"
+#include "FieldNames.hpp"
+#include "TypeNameTables.hpp"
+
+
+namespace AddOnCommands {
+  static GS::ObjectState GetWindows(const API_Guid& guid) {
+    GSErrCode err = NoError;
+
+    GS::ObjectState currentWindow;
+    API_Element element;
+
+    BNZeroMemory(&element, sizeof(API_Element));
+    element.header.guid = guid;
+    err = ACAPI_Element_Get(&element);
+
+    if (err == NoError) {
+		if (err == NoError) {
+		  currentWindow.Add(ApplicationIdFieldName, APIGuidToString(guid));
+		  currentWindow.Add(ParentElementIdFieldName, APIGuidToString(element.door.owner));
+
+		  AddOnCommands::GetOpeningBaseData<API_WindowType> (element.window, currentWindow);
+		}
+    }
+
+    return currentWindow;
+  }
+
+  GS::String GetWindowData::GetName () const {
+    return GetWindowCommandName;
+  }
+
+  GS::ObjectState GetWindowData::Execute (const GS::ObjectState& parameters, GS::ProcessControl& /*processControl*/) const {
+    GS::ObjectState result;
+
+    GS::Array<GS::UniString> ids;
+    parameters.Get(ApplicationIdsFieldName, ids);
+    GS::Array<API_Guid> elementGuids = ids.Transform<API_Guid>([](const GS::UniString& idStr)
+      { return APIGuidFromString(idStr.ToCStr()); });
+    
+    if (elementGuids.IsEmpty())
+      return result;
+
+    const auto& listAdderWindows = result.AddList<GS::ObjectState>(WindowsFieldName);
+
+    for (const API_Guid& guid : elementGuids)
+    {
+      API_Element element{};
+      element.header.guid = guid;
+
+      GSErrCode err = ACAPI_Element_Get(&element);
+
+      if (err != NoError /*|| element.header.type.typeID != API_WallID*/) {
+        return result;
+      }
+
+#ifdef ServerMainVers_2600
+        if (element.header.type.typeID == API_WindowID) {
+#else
+		if (element.header.typeID == API_WindowID) {
+#endif
+          GS::ObjectState door = GetWindows(element.header.guid);
+          listAdderWindows(door);
+        }
+      }
+
+    return result;
+  }
+
+}
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWindowData.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWindowData.hpp
new file mode 100644
index 0000000000..82a6a8fe46
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/GetWindowData.hpp
@@ -0,0 +1,22 @@
+#ifndef GET_WINDOW_DATA_HPP
+#define GET_WINDOW_DATA_HPP
+
+#include "BaseCommand.hpp"
+
+namespace AddOnCommands {
+
+
+	class GetWindowData : public BaseCommand {
+	public:
+		virtual GS::String							GetName() const override;
+		virtual GS::ObjectState						Execute(const GS::ObjectState& parameters, GS::ProcessControl& processControl) const override;
+#ifdef ServerMainVers_2600
+		virtual bool								IsProcessWindowVisible() const override { return true; }
+#endif
+	};
+
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Database.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Database.cpp
new file mode 100644
index 0000000000..49cbf7d770
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Database.cpp
@@ -0,0 +1,60 @@
+#include "Database.hpp"
+#include "ACAPinc.h"
+
+
+using namespace Utility;
+
+Database::Database() :
+	currentDatabaseType (API_ZombieWindowID)
+{
+	originalDatabaseInfo = Utility::Database::GetCurrent ();
+	currentDatabaseType= originalDatabaseInfo.typeID;
+}
+
+
+Database::~Database ()
+{
+	Utility::Database::ChangeCurrent (originalDatabaseInfo);
+}
+
+
+bool Database::IsInFloorPlan(void) const
+{
+	return currentDatabaseType == APIWind_FloorPlanID;
+}
+
+
+bool Database::IsIn3DWindow(void) const
+{
+	return currentDatabaseType == APIWind_3DModelID;
+}
+
+
+void Database::SwitchToFloorPlan(void)
+{
+	API_DatabaseInfo databaseInfo;
+	BNZeroMemory (&databaseInfo, sizeof (API_DatabaseInfo));
+	databaseInfo.typeID =  APIWind_FloorPlanID;
+	
+	ChangeCurrent (databaseInfo);
+	currentDatabaseType = databaseInfo.typeID;
+}
+
+
+/*static*/ API_DatabaseInfo Database::GetCurrent (void)
+{
+	API_DatabaseInfo databaseInfo;
+	BNZeroMemory (&databaseInfo, sizeof (API_DatabaseInfo));
+	GSErrCode err = ACAPI_Database (APIDb_GetCurrentDatabaseID, &databaseInfo, nullptr);
+
+	if (err != NoError)
+		databaseInfo.typeID = API_ZombieWindowID;
+
+	return databaseInfo;
+}
+
+
+/*static*/ void Database::ChangeCurrent (API_DatabaseInfo& databaseInfo)
+{
+	ACAPI_Database (APIDb_ChangeCurrentDatabaseID, &databaseInfo, nullptr);
+}
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Database.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Database.hpp
new file mode 100644
index 0000000000..1a15c11efe
--- /dev/null
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Database.hpp
@@ -0,0 +1,38 @@
+#ifndef DATABASE_HPP
+#define DATABASE_HPP
+
+#pragma once
+
+//API
+#include "APIdefs_Database.h"
+
+
+namespace Utility {
+
+
+class Database
+{
+public:
+	Database ();
+	virtual ~Database ();
+
+	bool IsInFloorPlan (void) const;
+	bool IsIn3DWindow (void) const;
+
+	void SwitchToFloorPlan(void);
+	void SwitchToPreviousState(void);
+
+private:
+	static API_DatabaseInfo GetCurrent (void);
+	static void ChangeCurrent (API_DatabaseInfo&);
+
+private:
+	API_DatabaseInfo originalDatabaseInfo;
+	API_DatabaseTypeID currentDatabaseType;
+};
+
+
+} //namespace Utility
+
+
+#endif //DATABASE_HPP
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/FieldNames.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/FieldNames.hpp
index 662ef57106..c18238b9d3 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/FieldNames.hpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/FieldNames.hpp
@@ -3,13 +3,20 @@
 
 static const char* ApplicationIdFieldName = "applicationId";
 static const char* ApplicationIdsFieldName = "applicationIds";
+static const char* ParentElementIdFieldName = "parentApplicationId";
+static const char* ElementFilterFieldName = "elementFilter";
 static const char* ElementTypeFieldName = "elementType";
 static const char* ElementTypesFieldName = "elementTypes";
+static const char* ElementsFieldName = "elements";
+static const char* SubElementsFieldName = "subElements";
 
 static const char* FloorIndexFieldName = "floorIndex";
 static const char* ShapeFieldName = "shape";
 
 static const char* WallsFieldName = "walls";
+static const char* WindowsFieldName = "windows";
+static const char* SubelementModelsFieldName = "subelementModels";
+static const char* DoorsFieldName = "doors";
 static const char* BeamsFieldName = "beams";
 static const char* SlabsFieldName = "slabs";
 static const char* ZonesFieldName = "zones";
@@ -37,76 +44,107 @@ namespace Wall
   static const char* BaseOffsetFieldName = "baseOffset";
   static const char* TopOffsetFieldName = "topOffset";
   static const char* FlippedFieldName = "flipped";
+  static const char* HasDoorFieldName = "hasDoor";
+  static const char* HasWindowFieldName = "hasWindow";
+
+}
+
+
+namespace OpeningBase {
+  static const char* DoorFieldName = "Door #%d";
+  //
+  static const char* guid = "guid";
+  // OpeningBase
+  static const char* width = "width";
+  static const char* height = "height";
+  static const char* subFloorThickness = "subFloorThickness";
+  static const char* reflected = "reflected";
+  static const char* oSide = "oSide";
+  static const char* refSide = "refSide";
+
+  static const char* buildingMaterial = "buildingMaterial";
+  static const char* libraryPart = "libraryPart";
+
+  static const char* revealDepthFromSide = "revealDepthFromSide";
+  static const char* jambDepthHead = "jambDepthHead";
+  static const char* jambDepth = "jambDepth";
+  static const char* jambDepth2 = "jambDepth2";
+  static const char* objLoc = "objLoc";
+  static const char* lower = "lower";
+  static const char* directionType = "directionType";
+  
+  static const char* startPoint = "startPoint";
+  static const char* dirVector = "dirVector";
 }
 
 
 namespace Beam
 {
-	// Naming
-	static const char* BeamSegmentName = "Segment #%d";
-	static const char* SchemeName = "Scheme #%d";
-	static const char* CutName = "Cut #%d";
-	static const char* HoleName = "Hole #%d";
-	// Main
-	static const char* begC = "begC";
-	static const char* endC = "endC";
-	static const char* aboveViewLinePen = "aboveViewLinePen";
-	static const char* refPen = "refPen";
-	static const char* cutContourLinePen = "cutContourLinePen";
-	static const char* sequence = "sequence";
-	static const char* isAutoOnStoryVisibility = "isAutoOnStoryVisibility";
-	static const char* offset = "offset";
-	static const char* level = "level";
-	static const char* curveAngle = "curveAngle";
-	static const char* verticalCurveHeight = "verticalCurveHeight";
-	static const char* beamShape = "beamShape";
-	static const char* hiddenLinePen = "hiddenLinePen";
-	static const char* anchorPoint = "anchorPoint";
-	static const char* belowViewLinePen = "belowViewLinePen";
-	static const char* isFlipped = "isFlipped";
-	static const char* isSlanted = "isSlanted";
-	static const char* slantAngle = "slantAngle";
-	static const char* profileAngle = "profileAngle";
-	static const char* nSegments = "nSegments";
-	static const char* nCuts = "nCuts";
-	static const char* nSchemes = "nSchemes";
-	static const char* nProfiles = "nProfiles";
-	static const char* useCoverFill = "useCoverFill";
-	static const char* useCoverFillFromSurface = "useCoverFillFromSurface";
-	static const char* coverFillOrientationComesFrom3D = "coverFillOrientationComesFrom3D";
-	static const char* coverFillForegroundPen = "coverFillForegroundPen";
-	static const char* coverFillBackgroundPen = "coverFillBackgroundPen";
-	static const char* modelElemStructureType = "modelElemStructureType";
-	// From API_BeamSegmentType
-	static const char* segmentData = "Segments";
-	static const char* circleBased = "circleBased";
-	static const char* profileAttrName = "profileAttrName";
-	static const char* buildingMaterial = "buildingMaterial";
-	static const char* nominalWidth = "nominalWidth";
-	static const char* nominalHeight = "nominalHeight";
-	static const char* isHomogeneous = "isHomogeneous";
-	static const char* endWidth = "endWidth";
-	static const char* endHeight = "endHeight";
-	static const char* isEndWidthAndHeightLinked = "isEndWidthAndHeightLinked";
-	static const char* isWidthAndHeightLinked = "isWidthAndHeightLinked";
-	// From API_AssemblySegmentSchemeData
-	static const char* schemeData = "Schemes";
-	static const char* lengthType = "lengthType";
-	static const char* fixedLength = "fixedLength";
-	static const char* lengthProportion = "lengthProportion";
-	// From API_AssemblySegmentCutData
-	static const char* cutData = "Cuts";
-	static const char* cutType = "cutType";
-	static const char* customAngle = "customAngle";
-	// From API_Beam_Hole
-	static const char* holeData = "Holes";
-	static const char* holeType = "holeType";
-	static const char* holeContourOn = "holeContourOn";
-	static const char* holeId = "holeId";
-	static const char* centerx = "centerx";
-	static const char* centerz = "centerz";
-	static const char* width = "width";
-	static const char* height = "height";
+  // Naming
+  static const char* BeamSegmentName = "Segment #%d";
+  static const char* SchemeName = "Scheme #%d";
+  static const char* CutName = "Cut #%d";
+  static const char* HoleName = "Hole #%d";
+  // Main
+  static const char* begC = "begC";
+  static const char* endC = "endC";
+  static const char* aboveViewLinePen = "aboveViewLinePen";
+  static const char* refPen = "refPen";
+  static const char* cutContourLinePen = "cutContourLinePen";
+  static const char* sequence = "sequence";
+  static const char* isAutoOnStoryVisibility = "isAutoOnStoryVisibility";
+  static const char* offset = "offset";
+  static const char* level = "level";
+  static const char* curveAngle = "curveAngle";
+  static const char* verticalCurveHeight = "verticalCurveHeight";
+  static const char* beamShape = "beamShape";
+  static const char* hiddenLinePen = "hiddenLinePen";
+  static const char* anchorPoint = "anchorPoint";
+  static const char* belowViewLinePen = "belowViewLinePen";
+  static const char* isFlipped = "isFlipped";
+  static const char* isSlanted = "isSlanted";
+  static const char* slantAngle = "slantAngle";
+  static const char* profileAngle = "profileAngle";
+  static const char* nSegments = "nSegments";
+  static const char* nCuts = "nCuts";
+  static const char* nSchemes = "nSchemes";
+  static const char* nProfiles = "nProfiles";
+  static const char* useCoverFill = "useCoverFill";
+  static const char* useCoverFillFromSurface = "useCoverFillFromSurface";
+  static const char* coverFillOrientationComesFrom3D = "coverFillOrientationComesFrom3D";
+  static const char* coverFillForegroundPen = "coverFillForegroundPen";
+  static const char* coverFillBackgroundPen = "coverFillBackgroundPen";
+  static const char* modelElemStructureType = "modelElemStructureType";
+  // From API_BeamSegmentType
+  static const char* segmentData = "Segments";
+  static const char* circleBased = "circleBased";
+  static const char* profileAttrName = "profileAttrName";
+  static const char* buildingMaterial = "buildingMaterial";
+  static const char* nominalWidth = "nominalWidth";
+  static const char* nominalHeight = "nominalHeight";
+  static const char* isHomogeneous = "isHomogeneous";
+  static const char* endWidth = "endWidth";
+  static const char* endHeight = "endHeight";
+  static const char* isEndWidthAndHeightLinked = "isEndWidthAndHeightLinked";
+  static const char* isWidthAndHeightLinked = "isWidthAndHeightLinked";
+  // From API_AssemblySegmentSchemeData
+  static const char* schemeData = "Schemes";
+  static const char* lengthType = "lengthType";
+  static const char* fixedLength = "fixedLength";
+  static const char* lengthProportion = "lengthProportion";
+  // From API_AssemblySegmentCutData
+  static const char* cutData = "Cuts";
+  static const char* cutType = "cutType";
+  static const char* customAngle = "customAngle";
+  // From API_Beam_Hole
+  static const char* holeData = "Holes";
+  static const char* holeType = "holeType";
+  static const char* holeContourOn = "holeContourOn";
+  static const char* holeId = "holeId";
+  static const char* centerx = "centerx";
+  static const char* centerz = "centerz";
+  static const char* width = "width";
+  static const char* height = "height";
 }
 
 
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/ResourceIds.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/ResourceIds.hpp
index cf4fece747..723b3ec766 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/ResourceIds.hpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/ResourceIds.hpp
@@ -6,16 +6,21 @@
 
 #define CommandNamespace						"Speckle";
 #define GetModelForElementsCommandName			"GetModelForElements";
-#define GetSelectedApplicationIdsCommandName 		"GetSelectedApplicationIds";
+#define GetElementIdsCommandName 				"GetElementIds";
 #define GetElementTypesCommandName				"GetElementTypes";
 #define GetWallDataCommandName					"GetWallData";
+#define GetDoorCommandName				        "GetDoorData";
+#define GetWindowCommandName				    "GetWindowData";
 #define GetBeamDataCommandName					"GetBeamData";
 #define GetSlabDataCommandName					"GetSlabData";
 #define GetRoomDataCommandName					"GetRoomData";
 #define GetRoofDataCommandName					"GetRoofData";
 #define GetProjectInfoCommandName				"GetProjectInfo";
+#define GetSubelementInfoCommandName				"GetSubelementInfo";
 #define CreateDirectShapesCommandName 			"CreateDirectShapes";
 #define CreateWallCommandName					"CreateWall";
+#define CreateDoorCommandName				        "CreateDoor";
+#define CreateWindowCommandName				    "CreateWindow";
 #define CreateBeamCommandName                   "CreateBeam";
 #define CreateSlabCommandName					"CreateSlab";
 #define CreateZoneCommandName                   "CreateZone";
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/TypeNameTables.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/TypeNameTables.cpp
index 40c1a550d1..3e283b8191 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/TypeNameTables.cpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/TypeNameTables.cpp
@@ -93,4 +93,11 @@ const GS::HashTable<API_BeamShapeTypeID, GS::UniString> beamShapeTypeNames
 	{ API_StraightBeam, "Straight" },
 	{ API_HorizontallyCurvedBeam, "HorizontallyCurved"},
 	{ API_VerticallyCurvedBeam, "VerticallyCurved"}
-};
\ No newline at end of file
+};
+
+
+const GS::HashTable<API_WindowDoorDirectionTypes, GS::UniString> windowDoorDirectionTypeNames
+{
+	{ API_WDAssociativeToWall, "AssociativeToWall" },
+	{ API_WDVertical, "Vertical"},
+};
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/TypeNameTables.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/TypeNameTables.hpp
index 854e06d680..6ca997680c 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/TypeNameTables.hpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/TypeNameTables.hpp
@@ -17,5 +17,6 @@ extern const GS::HashTable<API_AssemblySegmentLengthTypeID, GS::UniString> segme
 extern const GS::HashTable<API_AssemblySegmentCutTypeID, GS::UniString> assemblySegmentCutTypeNames;
 extern const GS::HashTable<API_BHoleTypeID, GS::UniString> beamHoleTypeNames;
 extern const GS::HashTable<API_BeamShapeTypeID, GS::UniString> beamShapeTypeNames;
+extern const GS::HashTable<API_WindowDoorDirectionTypes, GS::UniString> windowDoorDirectionTypeNames;
 
 #endif
\ No newline at end of file
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Utility.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Utility.cpp
index 548b7280e0..54b73ff0b7 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/Utility.cpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Utility.cpp
@@ -166,5 +166,22 @@ namespace Utility {
 			floorInd += GetActualStoryItem().index;
 	}
 
+	GS::Array<API_Guid> GetWallSubelements(API_WallType& wall) {
+		GS::Array<API_Guid> result;
+
+		if (wall.hasDoor) {
+			GS::Array<API_Guid> doors;
+			GSErrCode err = ACAPI_Element_GetConnectedElements(wall.head.guid, API_DoorID, &doors);
+			if (err == NoError)
+				result.Append(doors);
+		}
+		if (wall.hasWindow) {
+			GS::Array<API_Guid> windows;
+			GSErrCode err = ACAPI_Element_GetConnectedElements(wall.head.guid, API_WindowID, &windows);
+			if (err == NoError)
+				result.Append(windows);
+		}
 
+		return result;
+	}
 }
\ No newline at end of file
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Utility.hpp b/ConnectorArchicad/AddOn/Sources/AddOn/Utility.hpp
index b62e3e6793..69ef9bf685 100644
--- a/ConnectorArchicad/AddOn/Sources/AddOn/Utility.hpp
+++ b/ConnectorArchicad/AddOn/Sources/AddOn/Utility.hpp
@@ -24,6 +24,7 @@ namespace Utility {
 
   void SetStoryLevel(const double& inLevel, const short& floorInd, double& level);
 
+  GS::Array<API_Guid> GetWallSubelements(API_WallType& wall);
 
 }
 
diff --git a/ConnectorArchicad/ConnectorArchicad/.editorconfig b/ConnectorArchicad/ConnectorArchicad/.editorconfig
index a45dc20816..3c2927d801 100644
--- a/ConnectorArchicad/ConnectorArchicad/.editorconfig
+++ b/ConnectorArchicad/ConnectorArchicad/.editorconfig
@@ -8,6 +8,9 @@ root = true
 indent_style = space
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
+[*]
+end_of_line = lf
+
 # Code files
 [*.{cs, csx, vb, vbx}]
 indent_size = 2
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateDoor.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateDoor.cs
new file mode 100644
index 0000000000..11f3d80eb5
--- /dev/null
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateDoor.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Objects.BuiltElements.Archicad;
+using Speckle.Core.Models;
+
+namespace Archicad.Communication.Commands
+{
+  sealed internal class CreateDoor : ICommand<IEnumerable<string>>
+  {
+
+    [JsonObject(MemberSerialization.OptIn)]
+    public sealed class Parameters
+    {
+      [JsonProperty("subElements")]
+      private IEnumerable<ArchicadDoor> Datas { get; }
+
+      public Parameters(IEnumerable<ArchicadDoor> datas)
+      {
+        Datas = datas;
+      }
+
+    }
+
+    [JsonObject(MemberSerialization.OptIn)]
+    private sealed class Result
+    {
+
+      [JsonProperty("applicationIds")]
+      public IEnumerable<string> ApplicationIds { get; private set; }
+
+    }
+    private IEnumerable<ArchicadDoor> Datas { get; }
+
+    public CreateDoor(IEnumerable<ArchicadDoor> datas)
+    {
+      Datas = datas;
+    }
+
+    public async Task<IEnumerable<string>> Execute()
+    {
+      var result = await HttpCommandExecutor.Execute<Parameters, Result>("CreateDoor", new Parameters(Datas));
+      return result == null ? null : result.ApplicationIds;
+    }
+
+  }
+}
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateFloor.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateFloor.cs
index 51e1ab910d..e8dc71b9a0 100644
--- a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateFloor.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateFloor.cs
@@ -11,9 +11,9 @@ sealed internal class CreateFloor : ICommand<IEnumerable<string>>
     public sealed class Parameters
     {
       [JsonProperty("slabs")]
-      private IEnumerable<Floor> Datas { get; }
+      private IEnumerable<ArchicadFloor> Datas { get; }
 
-      public Parameters(IEnumerable<Floor> datas)
+      public Parameters(IEnumerable<ArchicadFloor> datas)
       {
         Datas = datas;
       }
@@ -26,9 +26,9 @@ private sealed class Result
       public IEnumerable<string> ApplicationIds { get; private set; }
     }
 
-    private IEnumerable<Floor> Datas { get; }
+    private IEnumerable<ArchicadFloor> Datas { get; }
 
-    public CreateFloor(IEnumerable<Floor> datas)
+    public CreateFloor(IEnumerable<ArchicadFloor> datas)
     {
       Datas = datas;
     }
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateRoom.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateRoom.cs
index 70d1cc9cad..0e7cc4db9d 100644
--- a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateRoom.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateRoom.cs
@@ -10,9 +10,9 @@ sealed internal class CreateRoom : ICommand<IEnumerable<string>>
     [JsonObject(MemberSerialization.OptIn)]
     public sealed class Parameters
     {
-      [JsonProperty("zones")] private IEnumerable<Room> Datas { get; }
+      [JsonProperty("zones")] private IEnumerable<ArchicadRoom> Datas { get; }
 
-      public Parameters(IEnumerable<Room> datas)
+      public Parameters(IEnumerable<ArchicadRoom> datas)
       {
         Datas = datas;
       }
@@ -24,9 +24,9 @@ private sealed class Result
       [JsonProperty("applicationIds")] public IEnumerable<string> ApplicationIds { get; private set; }
     }
 
-    private IEnumerable<Room> Datas { get; }
+    private IEnumerable<ArchicadRoom> Datas { get; }
 
-    public CreateRoom(IEnumerable<Room> datas)
+    public CreateRoom(IEnumerable<ArchicadRoom> datas)
     {
       Datas = datas;
     }
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWall.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWall.cs
index 214fe9ce5f..657f4ead45 100644
--- a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWall.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWall.cs
@@ -13,9 +13,9 @@ public sealed class Parameters
     {
 
       [JsonProperty("walls")]
-      private IEnumerable<Wall> Datas { get; }
+      private IEnumerable<ArchicadWall> Datas { get; }
 
-      public Parameters(IEnumerable<Wall> datas)
+      public Parameters(IEnumerable<ArchicadWall> datas)
       {
         Datas = datas;
       }
@@ -31,9 +31,9 @@ private sealed class Result
 
     }
 
-    private IEnumerable<Wall> Datas { get; }
+    private IEnumerable<ArchicadWall> Datas { get; }
 
-    public CreateWall(IEnumerable<Wall> datas)
+    public CreateWall(IEnumerable<ArchicadWall> datas)
     {
       foreach (var data in datas)
       {
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWindow.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWindow.cs
new file mode 100644
index 0000000000..5bc38694b5
--- /dev/null
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWindow.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Objects.BuiltElements.Archicad;
+using Speckle.Core.Models;
+
+namespace Archicad.Communication.Commands
+{
+  sealed internal class CreateWindow : ICommand<IEnumerable<string>>
+  {
+
+    [JsonObject(MemberSerialization.OptIn)]
+    public sealed class Parameters
+    {
+      [JsonProperty("subElements")]
+      private IEnumerable<ArchicadWindow> Datas { get; }
+
+      public Parameters(IEnumerable<ArchicadWindow> datas)
+      {
+        Datas = datas;
+      }
+
+    }
+
+    [JsonObject(MemberSerialization.OptIn)]
+    private sealed class Result
+    {
+
+      [JsonProperty("applicationIds")]
+      public IEnumerable<string> ApplicationIds { get; private set; }
+
+    }
+    private IEnumerable<ArchicadWindow> Datas { get; }
+
+    public CreateWindow(IEnumerable<ArchicadWindow> datas)
+    {
+      Datas = datas;
+    }
+
+    public async Task<IEnumerable<string>> Execute()
+    {
+      var result = await HttpCommandExecutor.Execute<Parameters, Result>("CreateWindow", new Parameters(Datas));
+      return result == null ? null : result.ApplicationIds;
+    }
+
+  }
+}
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetDoorData.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetDoorData.cs
new file mode 100644
index 0000000000..224cb86c30
--- /dev/null
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetDoorData.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Objects.BuiltElements.Archicad;
+using Speckle.Core.Kits;
+
+namespace Archicad.Communication.Commands
+{
+  sealed internal class GetDoorData : ICommand<IEnumerable<ArchicadDoor>>
+  {
+
+    [JsonObject(MemberSerialization.OptIn)]
+    public sealed class Parameters
+    {
+
+      [JsonProperty("applicationIds")]
+      private IEnumerable<string> ApplicationIds { get; }
+
+      public Parameters(IEnumerable<string> applicationIds)
+      {
+        ApplicationIds = applicationIds;
+      }
+
+    }
+
+    [JsonObject(MemberSerialization.OptIn)]
+    private sealed class Result
+    {
+
+      [JsonProperty("doors")]
+      public IEnumerable<ArchicadDoor> Datas { get; private set; }
+
+    }
+
+    private IEnumerable<string> ApplicationIds { get; }
+
+    public GetDoorData(IEnumerable<string> applicationIds)
+    {
+      ApplicationIds = applicationIds;
+    }
+
+    public async Task<IEnumerable<ArchicadDoor>> Execute()
+    {
+      Result result = await HttpCommandExecutor.Execute<Parameters, Result>("GetDoorData", new Parameters(ApplicationIds));
+      //foreach (var subelement in result.Datas)
+        //subelement.units = Units.Meters;
+
+      return result.Datas;
+    }
+
+  }
+}
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetElementIds.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetElementIds.cs
new file mode 100644
index 0000000000..4425557bbf
--- /dev/null
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetElementIds.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace Archicad.Communication.Commands
+{
+  internal sealed class GetElementIds : ICommand<IEnumerable<string>>
+  {
+    public enum ElementFilter
+    {
+      All,
+      Selection
+    }
+
+    #region --- Classes ---
+
+    [JsonObject(MemberSerialization.OptIn)]
+    public sealed class Parameters
+    {
+      #region --- Fields ---
+
+      [JsonProperty("elementFilter")]
+      [JsonConverter(typeof(StringEnumConverter))]
+      private ElementFilter Filter { get; }
+
+      #endregion
+
+      #region --- Ctor \ Dtor ---
+
+      public Parameters(ElementFilter filter)
+      {
+        Filter = filter;
+      }
+
+      #endregion
+    }
+
+    [JsonObject(MemberSerialization.OptIn)]
+    private sealed class Result
+    {
+      #region --- Fields ---
+
+      [JsonProperty("applicationIds")]
+      public IEnumerable<string> ApplicationIds { get; private set; }
+
+      #endregion
+    }
+
+    #endregion
+
+    #region --- Fields ---
+
+    private ElementFilter Filter { get; }
+
+    #endregion
+
+    #region --- Ctor \ Dtor ---
+
+    public GetElementIds(ElementFilter filter)
+    {
+      Filter = filter;
+    }
+
+    #endregion
+
+    #region --- Functions ---
+
+    public async Task<IEnumerable<string>> Execute()
+    {
+      Result result = await HttpCommandExecutor.Execute<Parameters, Result>("GetElementIds", new Parameters(Filter));
+      return result.ApplicationIds;
+    }
+
+    #endregion
+  }
+}
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetFloorData.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetFloorData.cs
index 8dd878e285..2fb9423ac9 100644
--- a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetFloorData.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetFloorData.cs
@@ -6,7 +6,7 @@
 
 namespace Archicad.Communication.Commands
 {
-  internal sealed class GetFloorData : ICommand<IEnumerable<Floor>>
+  internal sealed class GetFloorData : ICommand<IEnumerable<ArchicadFloor>>
   {
     [JsonObject(MemberSerialization.OptIn)]
     public sealed class Parameters
@@ -24,7 +24,7 @@ public Parameters(IEnumerable<string> applicationIds)
     private sealed class Result
     {
       [JsonProperty("slabs")]
-      public IEnumerable<Floor> Datas { get; private set; }
+      public IEnumerable<ArchicadFloor> Datas { get; private set; }
     }
 
     private IEnumerable<string> ApplicationIds { get; }
@@ -34,7 +34,7 @@ public GetFloorData(IEnumerable<string> applicationIds)
       ApplicationIds = applicationIds;
     }
 
-    public async Task<IEnumerable<Floor>> Execute()
+    public async Task<IEnumerable<ArchicadFloor>> Execute()
     {
       Result result = await HttpCommandExecutor.Execute<Parameters, Result>("GetSlabData", new Parameters(ApplicationIds));
       foreach (var floor in result.Datas)
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetRoomData.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetRoomData.cs
index 0aad5d2a25..278299e7d7 100644
--- a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetRoomData.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetRoomData.cs
@@ -6,7 +6,7 @@
 
 namespace Archicad.Communication.Commands
 {
-  sealed internal class GetRoomData : ICommand<IEnumerable<Room>>
+  sealed internal class GetRoomData : ICommand<IEnumerable<ArchicadRoom>>
   {
 
     [JsonObject(MemberSerialization.OptIn)]
@@ -28,7 +28,7 @@ private sealed class Result
     {
 
       [JsonProperty("zones")]
-      public IEnumerable<Room> Rooms { get; private set; }
+      public IEnumerable<ArchicadRoom> Rooms { get; private set; }
 
     }
 
@@ -39,7 +39,7 @@ public GetRoomData(IEnumerable<string> applicationIds)
       ApplicationIds = applicationIds;
     }
 
-    public async Task<IEnumerable<Room>> Execute()
+    public async Task<IEnumerable<ArchicadRoom>> Execute()
     {
       var result = await HttpCommandExecutor.Execute<Parameters, Result>("GetRoomData", new Parameters(ApplicationIds));
       foreach (var room in result.Rooms)
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetSelectedElements.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetSelectedElements.cs
deleted file mode 100644
index e65ea40902..0000000000
--- a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetSelectedElements.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace Archicad.Communication.Commands
-{
-  internal sealed class GetSelectedElements : ICommand<IEnumerable<string>>
-  {
-    #region --- Classes ---
-
-    [JsonObject]
-    public sealed class Parameters { }
-
-    [JsonObject(MemberSerialization.OptIn)]
-    private sealed class Result
-    {
-      #region --- Fields ---
-
-      [JsonProperty("applicationIds")]
-      public IEnumerable<string> ApplicationIds { get; private set; }
-
-      #endregion
-    }
-
-    #endregion
-
-    #region --- Functions ---
-
-    public async Task<IEnumerable<string>> Execute()
-    {
-      Result result = await HttpCommandExecutor.Execute<Parameters, Result>("GetSelectedApplicationIds", null);
-      return result.ApplicationIds;
-    }
-
-    #endregion
-  }
-}
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetSubelementInfo.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetSubelementInfo.cs
new file mode 100644
index 0000000000..5ff96fbff0
--- /dev/null
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetSubelementInfo.cs
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Objects.BuiltElements.Archicad;
+using Speckle.Core.Kits;
+
+namespace Archicad.Communication.Commands
+{
+  sealed internal class GetSubElementInfo : ICommand<IEnumerable<SubElementData>>
+  {
+
+    [JsonObject(MemberSerialization.OptIn)]
+    public sealed class Parameters
+    {
+
+      [JsonProperty("applicationId")]
+      private string ApplicationId { get; }
+
+      public Parameters(string applicationId)
+      {
+        ApplicationId = applicationId;
+      }
+
+    }
+
+    [JsonObject(MemberSerialization.OptIn)]
+    private sealed class Result
+    {
+
+      [JsonProperty("subelementModels")]
+      public IEnumerable<SubElementData> Datas { get; private set; }
+
+    }
+
+    private string ApplicationId { get; }
+
+    public GetSubElementInfo(string applicationId)
+    {
+      ApplicationId = applicationId;
+    }
+
+    public async Task<IEnumerable<SubElementData>> Execute()
+    {
+      Result result = await HttpCommandExecutor.Execute<Parameters, Result>("GetSubelementInfo", new Parameters(ApplicationId));
+      return result.Datas;
+    }
+
+  }
+}
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetWallData.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetWallData.cs
index f19ef42f29..42bebd5e16 100644
--- a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetWallData.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetWallData.cs
@@ -6,7 +6,7 @@
 
 namespace Archicad.Communication.Commands
 {
-  sealed internal class GetWallData : ICommand<IEnumerable<Wall>>
+  sealed internal class GetWallData : ICommand<IEnumerable<ArchicadWall>>
   {
 
     [JsonObject(MemberSerialization.OptIn)]
@@ -28,7 +28,7 @@ private sealed class Result
     {
 
       [JsonProperty("walls")]
-      public IEnumerable<Wall> Datas { get; private set; }
+      public IEnumerable<ArchicadWall> Datas { get; private set; }
 
     }
 
@@ -39,7 +39,7 @@ public GetWallData(IEnumerable<string> applicationIds)
       ApplicationIds = applicationIds;
     }
 
-    public async Task<IEnumerable<Wall>> Execute()
+    public async Task<IEnumerable<ArchicadWall>> Execute()
     {
       Result result = await HttpCommandExecutor.Execute<Parameters, Result>("GetWallData", new Parameters(ApplicationIds));
       foreach (var wall in result.Datas)
diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetWindowData.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetWindowData.cs
new file mode 100644
index 0000000000..1d747abdc6
--- /dev/null
+++ b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetWindowData.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Objects.BuiltElements.Archicad;
+using Speckle.Core.Kits;
+
+namespace Archicad.Communication.Commands
+{
+  sealed internal class GetWindowData : ICommand<IEnumerable<ArchicadWindow>>
+  {
+
+    [JsonObject(MemberSerialization.OptIn)]
+    public sealed class Parameters
+    {
+
+      [JsonProperty("applicationIds")]
+      private IEnumerable<string> ApplicationIds { get; }
+
+      public Parameters(IEnumerable<string> applicationIds)
+      {
+        ApplicationIds = applicationIds;
+      }
+
+    }
+
+    [JsonObject(MemberSerialization.OptIn)]
+    private sealed class Result
+    {
+
+      [JsonProperty("windows")]
+      public IEnumerable<ArchicadWindow> Datas { get; private set; }
+
+    }
+
+    private IEnumerable<string> ApplicationIds { get; }
+
+    public GetWindowData(IEnumerable<string> applicationIds)
+    {
+      ApplicationIds = applicationIds;
+    }
+
+    public async Task<IEnumerable<ArchicadWindow>> Execute()
+    {
+      Result result = await HttpCommandExecutor.Execute<Parameters, Result>("GetWindowData", new Parameters(ApplicationIds));
+      //foreach (var subelement in result.Datas)
+        //subelement.units = Units.Meters;
+
+      return result.Datas;
+    }
+
+  }
+}
diff --git a/ConnectorArchicad/ConnectorArchicad/ConnectorBinding.cs b/ConnectorArchicad/ConnectorArchicad/ConnectorBinding.cs
index 6d27b0acd4..b41ff7da41 100644
--- a/ConnectorArchicad/ConnectorArchicad/ConnectorBinding.cs
+++ b/ConnectorArchicad/ConnectorArchicad/ConnectorBinding.cs
@@ -81,13 +81,18 @@ public override List<string> GetObjectsInView()
 
     public override List<string> GetSelectedObjects()
     {
-      var elementIds = AsyncCommandProcessor.Execute(new Communication.Commands.GetSelectedElements())?.Result;
+      var elementIds = AsyncCommandProcessor.Execute(new Communication.Commands.GetElementIds(Communication.Commands.GetElementIds.ElementFilter.Selection))?.Result;
       return elementIds is null ? new List<string>() : elementIds.ToList();
     }
 
     public override List<ISelectionFilter> GetSelectionFilters()
     {
-      return new List<ISelectionFilter> { new ManualSelectionFilter() };
+      return new List<ISelectionFilter>()
+      {
+        new ManualSelectionFilter(),
+        new AllSelectionFilter {Slug="all",  Name = "Everything", Icon = "CubeScan", Description = "Sends all supported elements and project information." }
+      };
+
     }
 
     public override List<StreamState> GetStreamsInFile()
@@ -137,9 +142,10 @@ public override async Task<string> SendStream(StreamState state, ProgressViewMod
       if (state.Filter is null)
         return null;
 
-      state.SelectedObjectIds = state.Filter.Selection;
+      var commitObject = await ElementConverterManager.Instance.ConvertToSpeckle(
+        state.Filter,
+        progress);
 
-      var commitObject = await ElementConverterManager.Instance.ConvertToSpeckle(state.SelectedObjectIds, progress.CancellationTokenSource.Token);
       if (commitObject is not null)
       {
         return await Helpers.Send(IdentifyStream(state), commitObject, state.CommitMessage, HostApplications.Archicad.Name);
diff --git a/ConnectorArchicad/ConnectorArchicad/Converters/Converters/DoorConverter.cs b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/DoorConverter.cs
new file mode 100644
index 0000000000..b34f7ac87a
--- /dev/null
+++ b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/DoorConverter.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Archicad.Communication;
+using Archicad.Model;
+using Objects.BuiltElements.Revit;
+using Objects.Geometry;
+using Speckle.Core.Models;
+
+namespace Archicad.Converters
+{
+  public sealed class Door : IConverter
+  {
+    public Type Type => typeof(Objects.BuiltElements.Archicad.ArchicadDoor);
+
+    public async Task<List<string>> ConvertToArchicad(IEnumerable<Base> elements, CancellationToken token)
+    {
+      var doors = new List<Objects.BuiltElements.Archicad.ArchicadDoor>();
+      foreach (var el in elements)
+      {
+        switch (el)
+        {
+          case Objects.BuiltElements.Archicad.ArchicadDoor archicadDoors:
+            doors.Add(archicadDoors);
+            break;
+          //case Objects.BuiltElements.Opening window:
+          //  var baseLine = (Line)wall.baseLine;
+          //  var newWall = new Objects.BuiltElements.Archicad.ArchicadDoor(Utils.ScaleToNative(baseLine.start),
+          //    Utils.ScaleToNative(baseLine.end), Utils.ScaleToNative(wall.height, wall.units));
+          //  if (el is RevitWall revitWall)
+          //    newWall.flipped = revitWall.flipped;
+          //  walls.Add(newWall);
+          //  break;
+        }
+      }
+
+      var result = await AsyncCommandProcessor.Execute(new Communication.Commands.CreateDoor(doors), token);
+
+      return result is null ? new List<string>() : result.ToList();
+    }
+
+    public async Task<List<Base>> ConvertToSpeckle(IEnumerable<Model.ElementModelData> elements,
+      CancellationToken token)
+    {
+      var elementModels = elements as ElementModelData[] ?? elements.ToArray();
+      IEnumerable<Objects.BuiltElements.Archicad.ArchicadDoor> datas =
+        await AsyncCommandProcessor.Execute(new Communication.Commands.GetDoorData(elementModels.Select(e => e.applicationId)));
+
+      if (datas is null )
+      {
+        return new List<Base>();
+      }
+
+      List<Base> openings = new List<Base>();
+      foreach ( Objects.BuiltElements.Archicad.ArchicadDoor subelement in datas)
+      {
+        subelement.displayValue =
+          Operations.ModelConverter.MeshesToSpeckle(elementModels.First(e => e.applicationId == subelement.applicationId)
+            .model);
+        openings.Add(subelement);
+      }
+
+      return openings;
+    }
+  }
+}
diff --git a/ConnectorArchicad/ConnectorArchicad/Converters/Converters/FloorConverter.cs b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/FloorConverter.cs
index da798fe5bc..e78ca887ca 100644
--- a/ConnectorArchicad/ConnectorArchicad/Converters/Converters/FloorConverter.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/FloorConverter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -15,16 +15,16 @@ public sealed class Floor : IConverter
 
     public async Task<List<string>> ConvertToArchicad(IEnumerable<Base> elements, CancellationToken token)
     {
-      var floors = new List<Objects.BuiltElements.Archicad.Floor>();
+      var floors = new List<Objects.BuiltElements.Archicad.ArchicadFloor>();
       foreach ( var el in elements )
       {
         switch ( el )
         {
-          case Objects.BuiltElements.Archicad.Floor archiFloor:
+          case Objects.BuiltElements.Archicad.ArchicadFloor archiFloor:
             floors.Add(archiFloor);
             break;
           case  Objects.BuiltElements.Floor floor:
-            floors.Add(new Objects.BuiltElements.Archicad.Floor
+            floors.Add(new Objects.BuiltElements.Archicad.ArchicadFloor
             {
               shape = Utils.PolycurvesToElementShape(floor.outline, floor.voids),
             });
diff --git a/ConnectorArchicad/ConnectorArchicad/Converters/Converters/RoomConverter.cs b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/RoomConverter.cs
index c80b63b864..0829e18b25 100644
--- a/ConnectorArchicad/ConnectorArchicad/Converters/Converters/RoomConverter.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/RoomConverter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -18,16 +18,16 @@ public sealed class Room : IConverter
 
     public async Task<List<string>> ConvertToArchicad(IEnumerable<Base> elements, CancellationToken token)
     {
-      var rooms = new List<Objects.BuiltElements.Archicad.Room>();
+      var rooms = new List<Objects.BuiltElements.Archicad.ArchicadRoom>();
       foreach ( var el in elements )
       {
         switch ( el )
         {
-          case Objects.BuiltElements.Archicad.Room archiRoom:
+          case Objects.BuiltElements.Archicad.ArchicadRoom archiRoom:
             rooms.Add(archiRoom);
             break;
           case Objects.BuiltElements.Room room:
-            rooms.Add(new Objects.BuiltElements.Archicad.Room
+            rooms.Add(new Objects.BuiltElements.Archicad.ArchicadRoom
             {
               shape = Utils.PolycurvesToElementShape(room.outline, room.voids),
               name = room.name,
@@ -47,7 +47,7 @@ public async Task<List<Base>> ConvertToSpeckle(IEnumerable<Model.ElementModelDat
       CancellationToken token)
     {
       var elementModels = elements as ElementModelData[ ] ?? elements.ToArray();
-      IEnumerable<Objects.BuiltElements.Archicad.Room> data =
+      IEnumerable<Objects.BuiltElements.Archicad.ArchicadRoom> data =
         await AsyncCommandProcessor.Execute(
           new Communication.Commands.GetRoomData(elementModels.Select(e => e.applicationId)),
           token);
@@ -57,7 +57,7 @@ await AsyncCommandProcessor.Execute(
       }
 
       List<Base> rooms = new List<Base>();
-      foreach ( Objects.BuiltElements.Archicad.Room room in data )
+      foreach ( Objects.BuiltElements.Archicad.ArchicadRoom room in data )
       {
         room.displayValue =
           Operations.ModelConverter.MeshesToSpeckle(elementModels.First(e => e.applicationId == room.applicationId)
diff --git a/ConnectorArchicad/ConnectorArchicad/Converters/Converters/WallConverter.cs b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/WallConverter.cs
index d5febf6eed..37a60d5457 100644
--- a/ConnectorArchicad/ConnectorArchicad/Converters/Converters/WallConverter.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/WallConverter.cs
@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Archicad.Communication;
 using Archicad.Model;
+using Objects.BuiltElements.Archicad;
 using Objects.BuiltElements.Revit;
 using Objects.Geometry;
 using Speckle.Core.Models;
@@ -17,17 +18,17 @@ public sealed class Wall : IConverter
 
     public async Task<List<string>> ConvertToArchicad(IEnumerable<Base> elements, CancellationToken token)
     {
-      var walls = new List<Objects.BuiltElements.Archicad.Wall>();
+      var walls = new List<Objects.BuiltElements.Archicad.ArchicadWall>();
       foreach ( var el in elements )
       {
         switch ( el )
         {
-          case Objects.BuiltElements.Archicad.Wall archiWall:
+          case Objects.BuiltElements.Archicad.ArchicadWall archiWall:
             walls.Add(archiWall);
             break;
           case Objects.BuiltElements.Wall wall:
             var baseLine = ( Line )wall.baseLine;
-            var newWall = new Objects.BuiltElements.Archicad.Wall(Utils.ScaleToNative(baseLine.start),
+            var newWall = new Objects.BuiltElements.Archicad.ArchicadWall(Utils.ScaleToNative(baseLine.start),
               Utils.ScaleToNative(baseLine.end), Utils.ScaleToNative(wall.height, wall.units));
             if ( el is RevitWall revitWall )
               newWall.flipped = revitWall.flipped;
@@ -44,18 +45,18 @@ public async Task<List<string>> ConvertToArchicad(IEnumerable<Base> elements, Ca
     public async Task<List<Base>> ConvertToSpeckle(IEnumerable<Model.ElementModelData> elements,
       CancellationToken token)
     {
+      List<Base> walls = new List<Base>();
       var elementModels = elements as ElementModelData[ ] ?? elements.ToArray();
-      IEnumerable<Objects.BuiltElements.Archicad.Wall> data =
+
+      IEnumerable<Objects.BuiltElements.Archicad.ArchicadWall> data =
         await AsyncCommandProcessor.Execute(
           new Communication.Commands.GetWallData(elementModels.Select(e => e.applicationId)),
           token);
+
       if ( data is null )
-      {
-        return new List<Base>();
-      }
+        return walls;
 
-      List<Base> walls = new List<Base>();
-      foreach ( Objects.BuiltElements.Archicad.Wall wall in data )
+      foreach ( Objects.BuiltElements.Archicad.ArchicadWall wall in data )
       {
         wall.displayValue =
           Operations.ModelConverter.MeshesToSpeckle(elementModels.First(e => e.applicationId == wall.applicationId)
diff --git a/ConnectorArchicad/ConnectorArchicad/Converters/Converters/WindowConverter.cs b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/WindowConverter.cs
new file mode 100644
index 0000000000..009c6c3ee9
--- /dev/null
+++ b/ConnectorArchicad/ConnectorArchicad/Converters/Converters/WindowConverter.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Archicad.Communication;
+using Archicad.Model;
+using Objects.BuiltElements.Revit;
+using Objects.Geometry;
+using Speckle.Core.Models;
+
+namespace Archicad.Converters
+{
+  public sealed class Window : IConverter
+  {
+    public Type Type => typeof(Objects.BuiltElements.Archicad.ArchicadWindow);
+
+    public async Task<List<string>> ConvertToArchicad(IEnumerable<Base> elements, CancellationToken token)
+    {
+      var windows = new List<Objects.BuiltElements.Archicad.ArchicadWindow>();
+      foreach (var el in elements)
+      {
+        switch (el)
+        {
+          case Objects.BuiltElements.Archicad.ArchicadWindow archicadWindow:
+            windows.Add(archicadWindow);
+            break;
+            //case Objects.BuiltElements.Opening window:
+            //  var baseLine = (Line)wall.baseLine;
+            //  var newWall = new Objects.BuiltElements.Archicad.ArchicadDoor(Utils.ScaleToNative(baseLine.start),
+            //    Utils.ScaleToNative(baseLine.end), Utils.ScaleToNative(wall.height, wall.units));
+            //  if (el is RevitWall revitWall)
+            //    newWall.flipped = revitWall.flipped;
+            //  walls.Add(newWall);
+            //  break;
+        }
+      }
+      var result = await AsyncCommandProcessor.Execute(new Communication.Commands.CreateWindow(windows), token);
+
+      return result is null ? new List<string>() : result.ToList();
+    }
+
+    public async Task<List<Base>> ConvertToSpeckle(IEnumerable<Model.ElementModelData> elements,
+      CancellationToken token)
+    {
+      // Get subelements
+      var elementModels = elements as ElementModelData[] ?? elements.ToArray();
+      IEnumerable<Objects.BuiltElements.Archicad.ArchicadWindow> datas =
+        await AsyncCommandProcessor.Execute(new Communication.Commands.GetWindowData(elementModels.Select(e => e.applicationId)));
+
+      if (datas is null )
+      {
+        return new List<Base>();
+      }
+
+      List<Base> openings = new List<Base>();
+      foreach ( Objects.BuiltElements.Archicad.ArchicadWindow subelement in datas)
+      {
+        subelement.displayValue =
+          Operations.ModelConverter.MeshesToSpeckle(elementModels.First(e => e.applicationId == subelement.applicationId)
+            .model);
+        openings.Add(subelement);
+      }
+
+      return openings;
+    }
+  }
+}
diff --git a/ConnectorArchicad/ConnectorArchicad/Converters/ElementConverterManager.cs b/ConnectorArchicad/ConnectorArchicad/Converters/ElementConverterManager.cs
index 2208ad8457..2740191409 100644
--- a/ConnectorArchicad/ConnectorArchicad/Converters/ElementConverterManager.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Converters/ElementConverterManager.cs
@@ -12,11 +12,15 @@
 using Objects.Geometry;
 using Speckle.Core.Kits;
 using Speckle.Core.Models;
+using DesktopUI2.ViewModels;
+using DesktopUI2.Models.Filters;
 using Ceiling = Objects.BuiltElements.Ceiling;
 using Floor = Objects.BuiltElements.Floor;
-using Room = Objects.BuiltElements.Archicad.Room;
 using Wall = Objects.BuiltElements.Wall;
 using Beam = Objects.BuiltElements.Beam;
+using Room = Objects.BuiltElements.Archicad.ArchicadRoom;
+using Door = Objects.BuiltElements.Archicad.ArchicadDoor;
+using Window = Objects.BuiltElements.Archicad.ArchicadWindow;
 
 namespace Archicad
 {
@@ -29,7 +33,10 @@ public sealed class ElementConverterManager
     private Dictionary<Type, Converters.IConverter> Converters { get; } = new();
 
     private Converters.IConverter DefaultConverter { get; } = new Converters.DirectShape();
+    private Dictionary<Type, IEnumerable<Base>> ReceivedObjects { get; set; }
+    private Dictionary<string, IEnumerable<string>> SelectedObjects { get; set; }
 
+    private List<string> CanHaveSubElements = new List<string> { "Wall" }; // Hardcoded until we know whats the shared property that defines wether elements may be have subelements or not.
     #endregion
 
     #region --- Ctor \ Dtor ---
@@ -43,54 +50,64 @@ private ElementConverterManager()
 
     #region --- Functions ---
 
-    public async Task<Base?> ConvertToSpeckle(IEnumerable<string> elementIds, CancellationToken token)
+    public async Task<Base?> ConvertToSpeckle(ISelectionFilter filter, ProgressViewModel progress)
     {
-      IEnumerable<ElementModelData> rawModels =
-        await AsyncCommandProcessor.Execute(new Communication.Commands.GetModelForElements(elementIds), token);
-      if ( rawModels is null )
-        return null;
+      var objectToCommit = new Base();
 
-      var elementTypeTable =
-        await AsyncCommandProcessor.Execute(new Communication.Commands.GetElementsType(elementIds), token);
-      if ( elementTypeTable is null )
-        return null;
+      IEnumerable<string> elementIds = filter.Selection;
+      if (filter.Slug == "all")
+        elementIds = AsyncCommandProcessor.Execute(new Communication.Commands.GetElementIds(Communication.Commands.GetElementIds.ElementFilter.All))?.Result;
 
-      var converted = new Dictionary<string, List<Base>>();
-      foreach ( var (key, value)in elementTypeTable )
+      SelectedObjects = await GetElementsType(elementIds, progress.CancellationTokenSource.Token);  // Gets all selected objects
+      SelectedObjects = SortSelectedObjects();
+
+      foreach (var (element, guids) in SelectedObjects) // For all kind of selected objects (like window, door, wall, etc.)
       {
-        var converter = GetConverterForElement(ElementTypeProvider.GetTypeByName(key));
-        var bases = await converter.ConvertToSpeckle(
-          rawModels.Where(model => value.Contains(model.applicationId)), token);
-        if ( bases.Count > 0 )
-          converted[ key ] = bases;
+        var objects = await ConvertOneTypeToSpeckle(guids, ElementTypeProvider.GetTypeByName(element), progress.CancellationTokenSource.Token);  // Deserialize all objects with hiven type
+        if (objects.Count() > 0)
+        {
+          objectToCommit["@" + element] = objects;  // Save 'em. Assigned objects are parents with subelements
+
+          // itermediate solution for the OneClick Send report
+          for (int i = 0; i < objects.Count(); i++)
+            progress.Report.ReportObjects.Add(new ApplicationObject("", ""));
+        }
       }
 
-      if ( converted.Count == 0 )
-        return null;
+      return objectToCommit;
+    }
+
+    Dictionary<string, IEnumerable<string>> SortSelectedObjects()
+    {
+      var retval = new Dictionary<string, IEnumerable<string>>();
+      var canHave = SelectedObjects.Where(e => CanHaveSubElements.Contains(e.Key));
+      var cannotHave = SelectedObjects.Where(e => !CanHaveSubElements.Contains(e.Key));
+
+      foreach (var (key,value) in canHave)
+      {
+        retval[key] = value;
+      }
 
-      var commitObject = new Base();
-      foreach ( var (key, bases) in converted )
+      foreach (var (key, value) in cannotHave)
       {
-        commitObject[ "@" + key ] = bases;
+        retval[key] = value;
       }
 
-      return commitObject;
+      return retval;
     }
 
     public async Task<List<string>> ConvertToNative(Base obj, CancellationToken token)
     {
       var result = new List<string>();
 
-      var elements = FlattenCommitObject(obj);
-      Console.WriteLine(String.Join(", ", elements.Select(el => $"{el.speckle_type}: {el.id}")));
-
-      var elementTypeTable = elements.GroupBy(element => element.GetType())
+      var falttenedElements = FlattenCommitObject(obj);
+      ReceivedObjects = falttenedElements.GroupBy(element => element.GetType())
         .ToDictionary(group => group.Key, group => group.Cast<Base>());
-      foreach ( var (key, value)in elementTypeTable )
+
+      foreach (var (elementType, elements) in ReceivedObjects)
       {
-        var converter = GetConverterForElement(key);
-        var convertedElementIds = await converter.ConvertToArchicad(value, token);
-        result.AddRange(convertedElementIds);
+        var convertedObjects = await ConvertOneTypeToNative(elementType, elements, token);
+        result.AddRange(convertedObjects);
       }
 
       return result;
@@ -111,18 +128,22 @@ private void RegisterConverters()
       }
     }
 
-    private Converters.IConverter GetConverterForElement(Type elementType)
+    public Converters.IConverter GetConverterForElement(Type elementType)
     {
-      if ( Converters.ContainsKey(elementType) )
-        return Converters[ elementType ];
-      if ( elementType.IsSubclassOf(typeof(Wall)) )
-        return Converters[ typeof(Wall) ];
+      if (Converters.ContainsKey(elementType))
+        return Converters[elementType];
+      if (elementType.IsSubclassOf(typeof(Wall)))
+        return Converters[typeof(Wall)];
       if (elementType.IsSubclassOf(typeof(Beam)))
         return Converters[typeof(Beam)];
-      if ( elementType.IsSubclassOf(typeof(Floor)) || elementType.IsSubclassOf(typeof(Ceiling)) )
-        return Converters[ typeof(Floor) ];
-      if ( elementType.IsSubclassOf(typeof(Objects.BuiltElements.Room)) )
-        return Converters[ typeof(Objects.BuiltElements.Room) ];
+      if (elementType.IsSubclassOf(typeof(Door)))
+        return Converters[typeof(Door)];
+      if (elementType.IsSubclassOf(typeof(Window)))
+        return Converters[typeof(Window)];
+      if (elementType.IsSubclassOf(typeof(Floor)) || elementType.IsSubclassOf(typeof(Ceiling)))
+        return Converters[typeof(Floor)];
+      if (elementType.IsSubclassOf(typeof(Objects.BuiltElements.Room)))
+        return Converters[typeof(Objects.BuiltElements.Room)];
 
       return DefaultConverter;
     }
@@ -139,6 +160,8 @@ public static bool CanConvertToNative(Base @object)
           Room _ => true,
           DirectShape _ => true,
           Mesh _ => true,
+          Door => true,
+          Window => true,
           _ => false
         };
     }
@@ -150,7 +173,7 @@ public static bool CanConvertToNative(Base @object)
     /// <param name="obj"></param>
     /// <param name="converter"></param>
     /// <returns></returns>
-    private List<Base> FlattenCommitObject(object obj)
+    public List<Base> FlattenCommitObject(object obj)
     {
       List<Base> objects = new List<Base>();
 
@@ -191,7 +214,156 @@ private List<Base> FlattenCommitObject(object obj)
           return objects;
       }
     }
-
     #endregion
+
+   
+    public async Task<List<string>?> ConvertSubElementsToNative(IEnumerable<Base> subElements, CancellationToken token)
+    {
+      //Should add a flag to each object to sign if has subelements or not.This way
+      // we could prevent unneccessary calls. (?)
+      var convertedObjects = new List<string>();
+
+      foreach (var subElement in subElements)
+      {
+        if (subElement == null)
+          continue;
+        var tmp = new List<Base>();
+        tmp.Add(subElement);
+        var convertedSubElements = await ConvertOneTypeToNative(subElement.GetType(), tmp, token);
+        convertedObjects.AddRange(convertedSubElements);
+      }
+
+      return convertedObjects;
+    }
+
+    public async Task<List<string>?> ConvertOneTypeToNative(Type elementType, IEnumerable<Base> elements, CancellationToken token)
+    {
+      List<string> result = new List<string>();
+      var elementConverter = GetConverterForElement(elementType);
+      List<string> convertedObjects = await elementConverter.ConvertToArchicad(elements, token);
+
+      result.AddRange(convertedObjects);
+
+      foreach (var parentObjectId in convertedObjects)
+      {
+
+        if (!ReceivedObjects.ContainsKey(elementType)) // Check if type exist at all
+          continue;
+        if (ReceivedObjects[elementType].Count() == 0)
+          continue;
+
+        Base currentObj = ReceivedObjects[elementType].Where(e => e.applicationId == parentObjectId).FirstOrDefault();
+        if (currentObj == null) // If no match found
+          continue;
+        if (!currentObj.GetMembers().ContainsKey("elements")) // If match found but doesnt have subelements
+          continue;
+
+        var subElements = currentObj["elements"] as List<Base>;
+
+        if (subElements != null && subElements.Count() > 0)
+        {
+          var convertedSubElements = await ConvertSubElementsToNative(subElements, token);
+          result.AddRange(convertedSubElements);
+        }
+
+      }
+
+      return result;
+    }
+
+    private async Task<Dictionary<string, IEnumerable<string>>?> GetElementsType(IEnumerable<string> applicationIds, CancellationToken token)
+    {
+      var retval = await AsyncCommandProcessor.Execute(new Communication.Commands.GetElementsType(applicationIds), token);
+      return retval;
+    }
+
+    public async Task<List<Base>?> ConvertOneTypeToSpeckle(IEnumerable<string> applicationIds, Type elementType, CancellationToken token)
+    {
+      var rawModels = await GetModelForElements(applicationIds, token); // Model data, like meshes
+      var elementConverter = ElementConverterManager.Instance.GetConverterForElement(elementType);  // Object converter
+      var convertedObjects = await elementConverter.ConvertToSpeckle(rawModels, token); // Deserialization
+
+      foreach (var convertedObject in convertedObjects)
+      {
+        var subElementsAsBases = await ConvertSubElementsToSpeckle(convertedObject.applicationId, token);
+        if (subElementsAsBases.Count() > 0)
+        {
+          convertedObject["elements"] = subElementsAsBases;
+        }
+
+      }
+
+      return convertedObjects;
+    }
+
+    private async Task<IEnumerable<Model.ElementModelData>> GetModelForElements(IEnumerable<string> applicationIds, CancellationToken token)
+    {
+      var retval = await AsyncCommandProcessor.Execute(new Communication.Commands.GetModelForElements(applicationIds), token);
+      return retval;
+    }
+
+    public async Task<List<Base>?> ConvertSubElementsToSpeckle(string applicationId, CancellationToken token)
+    {
+      var subElementsAsBases = new List<Base>();
+
+      var subElements = await GetAllSubElements(applicationId);
+      if (subElements.Count() == 0)
+        return subElementsAsBases;
+
+      var subElementsByGuid = await GetElementsType(subElements.Select(e => e.applicationId), token);
+      var mutualSubElements = GetAllMutualSubElements(subElementsByGuid);
+
+      foreach (var (element, guids) in mutualSubElements)
+      {
+        if (guids.Count() == 0)
+          continue;
+        var convertedSubElements = await ConvertOneTypeToSpeckle(guids, ElementTypeProvider.GetTypeByName(element), token);
+        subElementsAsBases = subElementsAsBases.Concat(convertedSubElements).ToList();  // Update list with new values
+      }
+      RemoveSubElements(mutualSubElements); // Remove subelements from SelectedObjects (where we stored all selected objects) 
+
+      return subElementsAsBases;
+    }
+
+    private async Task<IEnumerable<SubElementData>?> GetAllSubElements(string apllicationId)
+    {
+      IEnumerable<SubElementData>? currentSubElements =
+        await AsyncCommandProcessor.Execute(new Communication.Commands.GetSubElementInfo(apllicationId),
+        CancellationToken.None);
+
+      return currentSubElements;
+    }
+
+    private Dictionary<string, IEnumerable<string>> GetAllMutualSubElements(Dictionary<string, IEnumerable<string>> allSubElementsByGuid)
+    {
+      Dictionary<string, IEnumerable<string>> mutualSubElements = new Dictionary<string, IEnumerable<string>>();
+
+      foreach (var (element, guids) in allSubElementsByGuid)
+      {
+        mutualSubElements[element] = GetMutualSubElementsByType(element, guids);
+      }
+
+      return mutualSubElements;
+    }
+
+    private IEnumerable<string> GetMutualSubElementsByType(string elementType, IEnumerable<string> applicationIds)
+    {
+      if (!SelectedObjects.ContainsKey(elementType))
+        return new List<string>();
+
+      return SelectedObjects[elementType].Where(guid => applicationIds.Contains(guid));
+
+    }
+
+    public void RemoveSubElements(Dictionary<string, IEnumerable<string>> mutualSubElements)
+    {
+      foreach (var (element, guids) in mutualSubElements)
+      {
+        if (guids.Count() == 0)
+          continue;
+        var guidsToKeep = SelectedObjects[element].Where(guid => !guids.Contains(guid));
+        SelectedObjects[element] = guidsToKeep.ToList();
+      }
+    }
   }
 }
diff --git a/ConnectorArchicad/ConnectorArchicad/Converters/ElementTypeProvider.cs b/ConnectorArchicad/ConnectorArchicad/Converters/ElementTypeProvider.cs
index debcae7e8c..652c47d3a3 100644
--- a/ConnectorArchicad/ConnectorArchicad/Converters/ElementTypeProvider.cs
+++ b/ConnectorArchicad/ConnectorArchicad/Converters/ElementTypeProvider.cs
@@ -3,10 +3,12 @@
 using Archicad.Converters;
 using Objects.BuiltElements.Archicad;
 using DirectShape = Objects.BuiltElements.Archicad.DirectShape;
-using Floor = Objects.BuiltElements.Archicad.Floor;
-using Room = Objects.BuiltElements.Archicad.Room;
-using Wall = Objects.BuiltElements.Archicad.Wall;
+using Floor = Objects.BuiltElements.Archicad.ArchicadFloor;
+using Room = Objects.BuiltElements.Archicad.ArchicadRoom;
+using Wall = Objects.BuiltElements.Archicad.ArchicadWall;
 using Beam = Objects.BuiltElements.Archicad.ArchicadBeam;
+using Door = Objects.BuiltElements.Archicad.ArchicadDoor;
+using Window = Objects.BuiltElements.Archicad.ArchicadWindow;
 
 namespace Archicad
 {
@@ -16,7 +18,10 @@ public static class ElementTypeProvider
       { "Wall", typeof(Wall) },
       { "Slab", typeof(Floor) },
       { "Zone", typeof(Room) },
-      { "Beam", typeof(Beam) }
+      { "Beam", typeof(Beam) },
+      { "Door", typeof(Door) },
+      { "Window", typeof(Window) }
+
     };
 
     public static Type GetTypeByName(string name)
diff --git a/ConnectorAutocadCivil/ConnectorAutocad2021/Properties/AssemblyInfo.cs b/ConnectorAutocadCivil/ConnectorAutocad2021/Properties/AssemblyInfo.cs
index 5e6a3e366f..cc3a89ce30 100644
--- a/ConnectorAutocadCivil/ConnectorAutocad2021/Properties/AssemblyInfo.cs
+++ b/ConnectorAutocadCivil/ConnectorAutocad2021/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.0-beta")]
diff --git a/ConnectorAutocadCivil/ConnectorAutocad2022/Properties/AssemblyInfo.cs b/ConnectorAutocadCivil/ConnectorAutocad2022/Properties/AssemblyInfo.cs
index ad66daf149..90b6885077 100644
--- a/ConnectorAutocadCivil/ConnectorAutocad2022/Properties/AssemblyInfo.cs
+++ b/ConnectorAutocadCivil/ConnectorAutocad2022/Properties/AssemblyInfo.cs
@@ -34,4 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.0-beta")]
diff --git a/ConnectorAutocadCivil/ConnectorAutocad2023/ConnectorAutocad2023.csproj b/ConnectorAutocadCivil/ConnectorAutocad2023/ConnectorAutocad2023.csproj
index 78c18d7fe0..cfb40be607 100644
--- a/ConnectorAutocadCivil/ConnectorAutocad2023/ConnectorAutocad2023.csproj
+++ b/ConnectorAutocadCivil/ConnectorAutocad2023/ConnectorAutocad2023.csproj
@@ -77,4 +77,22 @@
   </ItemGroup>
   <Import Project="..\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- POST BUILD EVENTS START -->
+  <PropertyGroup>
+    <IsDesktopBuild Condition="'$(IsDesktopBuild)' == ''">true</IsDesktopBuild>
+  </PropertyGroup>
+  <Target Name="Clean">
+    <RemoveDir Directories="$(TargetDir);$(AppData)\Autodesk\ApplicationPlugins\Speckle2AutoCAD2023" />
+  </Target>
+  <Target Name="AfterBuild">
+    <CallTarget Condition="'$(Configuration)' == 'Debug' AND '$(IsDesktopBuild)' == true" Targets="AfterBuildDebug" />
+  </Target>
+  <Target Name="AfterBuildDebug">
+    <ItemGroup>
+      <SourceDLLs Include="$(TargetDir)\**\*.*" />
+    </ItemGroup>
+    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle2AutoCAD2023\%(RecursiveDir)" SourceFiles="@(SourceDLLs)" />
+  </Target>
+
+  <!--END-->
 </Project>
\ No newline at end of file
diff --git a/ConnectorAutocadCivil/ConnectorAutocad2023/Properties/AssemblyInfo.cs b/ConnectorAutocadCivil/ConnectorAutocad2023/Properties/AssemblyInfo.cs
index e47d833036..01a64ed029 100644
--- a/ConnectorAutocadCivil/ConnectorAutocad2023/Properties/AssemblyInfo.cs
+++ b/ConnectorAutocadCivil/ConnectorAutocad2023/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/ConnectorAutocadCivilShared.projitems b/ConnectorAutocadCivil/ConnectorAutocadCivil/ConnectorAutocadCivilShared.projitems
index 3bccfdd12b..9cf3b27263 100644
--- a/ConnectorAutocadCivil/ConnectorAutocadCivil/ConnectorAutocadCivilShared.projitems
+++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/ConnectorAutocadCivilShared.projitems
@@ -10,7 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Entry\SpeckleAutocadCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Entry\OneClickCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Storage\SpeckleStreamManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsAutocadCivil.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Utils.cs" />
diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/App.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/App.cs
index ed3eede4ae..5b2882f121 100644
--- a/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/App.cs
+++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/App.cs
@@ -1,17 +1,15 @@
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Reflection;
-using System.IO;
-using System.Windows.Media.Imaging;
-using System.Linq;
-using Forms = System.Windows.Forms;
-
-using Speckle.ConnectorAutocadCivil.UI;
-
+using Autodesk.AutoCAD.ApplicationServices;
 using Autodesk.AutoCAD.Runtime;
 using Autodesk.Windows;
-using Autodesk.AutoCAD.ApplicationServices;
+using Speckle.ConnectorAutocadCivil.UI;
 using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using Forms = System.Windows.Forms;
 
 namespace Speckle.ConnectorAutocadCivil.Entry
 {
@@ -45,9 +43,8 @@ public void Initialize()
         var bindings = new ConnectorBindingsAutocad();
         bindings.RegisterAppEvents();
         SpeckleAutocadCommand.Bindings = bindings;
-        OneClickCommand.Bindings = bindings;
       }
-      catch(System.Exception e)
+      catch (System.Exception e)
       {
         Forms.MessageBox.Show($"Add-in initialize context (true = application, false = doc): {Application.DocumentManager.IsApplicationContext.ToString()}. Error encountered: {e.ToString()}");
       }
@@ -230,9 +227,6 @@ public void Execute(object parameter)
             case "Speckle":
               SpeckleAutocadCommand.SpeckleCommand();
               break;
-            case "SpeckleSend":
-              OneClickCommand.SendCommand();
-              break;
             case "SpeckleCommunity":
               SpeckleAutocadCommand.SpeckleCommunity();
               break;
diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/OneClickCommand.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/OneClickCommand.cs
deleted file mode 100644
index 284ec329a4..0000000000
--- a/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/OneClickCommand.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Autodesk.AutoCAD.Runtime;
-using Application = Autodesk.AutoCAD.ApplicationServices.Core.Application;
-
-using DesktopUI2.ViewModels;
-using DesktopUI2.Models;
-using Speckle.ConnectorAutocadCivil.UI;
-
-
-namespace Speckle.ConnectorAutocadCivil.Entry
-{
-  public class OneClickCommand
-  {
-    public static ConnectorBindingsAutocad Bindings { get; set; }
-    public static StreamState FileStream { get; set; }
-
-    /// <summary>
-    /// Command to send selection to the document stream, or everything if nothing is selected
-    /// </summary>
-    [CommandMethod("SpeckleSend", CommandFlags.Modal)]
-    public static void SendCommand()
-    {
-      // initialize dui
-      SpeckleAutocadCommand.CreateOrFocusSpeckle(false);
-
-      // send
-      var oneClick = new OneClickViewModel(Bindings, FileStream);
-      oneClick.Send();
-      FileStream = oneClick.FileStream;
-    }
-  }
-}
-
diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.cs
index fe44025e3b..e29d90a783 100644
--- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.cs
+++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.cs
@@ -947,9 +947,11 @@ private void ConvertSendCommit(Base commitObject, ISpeckleConverter converter, S
           // get the db object from id
           DBObject obj = null;
           string layer = null;
+          string applicationId = null;
           if (Utils.GetHandle(autocadObjectHandle, out Handle hn))
           {
-            obj = hn.GetObject(tr, out string type, out layer);
+            obj = hn.GetObject(tr, out string type, out layer, out applicationId);
+            if (applicationId == null) { applicationId = autocadObjectHandle; }
           }
           else
           {
@@ -960,8 +962,7 @@ private void ConvertSendCommit(Base commitObject, ISpeckleConverter converter, S
           // create applicationobject for reporting
           Base converted = null;
           var descriptor = Utils.ObjectDescriptor(obj);
-          var applicationId = autocadObjectHandle; // TODO: ADD TEST FOR XDATA APPID
-          ApplicationObject reportObj = new ApplicationObject(autocadObjectHandle, descriptor) { applicationId = applicationId };
+          ApplicationObject reportObj = new ApplicationObject(autocadObjectHandle, descriptor) { applicationId = autocadObjectHandle };
 
           if (!converter.CanConvertToSpeckle(obj))
           {
diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs
index 4045940add..ec32c9a740 100644
--- a/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs
+++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs
@@ -120,6 +120,12 @@ public static ObjectId Append(this Entity entity, string layer = null)
       }
     }
 
+    /// <summary>
+    /// Gets the document model space
+    /// </summary>
+    /// <param name="db"></param>
+    /// <param name="mode"></param>
+    /// <returns></returns>
     public static BlockTableRecord GetModelSpace(this Database db, OpenMode mode = OpenMode.ForRead)
     {
       return (BlockTableRecord)SymbolUtilityServices.GetBlockModelSpaceId(db).GetObject(mode);
@@ -132,12 +138,13 @@ public static BlockTableRecord GetModelSpace(this Database db, OpenMode mode = O
     /// <param name="type">Object class dxf name</param>
     /// <param name="layer">Object layer name</param>
     /// <returns></returns>
-    public static DBObject GetObject(this Handle handle, Transaction tr, out string type, out string layer)
+    public static DBObject GetObject(this Handle handle, Transaction tr, out string type, out string layer, out string applicationId)
     {
       Document Doc = Application.DocumentManager.MdiActiveDocument;
       DBObject obj = null;
       type = null;
       layer = null;
+      applicationId = null;
 
       // get objectId
       ObjectId id = Doc.Database.GetObjectId(false, handle, 0);
@@ -150,6 +157,20 @@ public static DBObject GetObject(this Handle handle, Transaction tr, out string
           Entity objEntity = obj as Entity;
           type = id.ObjectClass.DxfName;
           layer = objEntity.Layer;
+
+          // application id is stored in xdata
+          ResultBuffer rb = objEntity.GetXDataForApplication(ApplicationIdKey);
+          if (rb != null)
+          {
+            foreach (var entry in rb)
+            {
+              if (entry.TypeCode == 1000)
+              {
+                applicationId = entry.Value as string;
+                break;
+              }
+            }
+          }
         }
       }
       return obj;
@@ -376,14 +397,15 @@ public static List<string> ConvertibleObjects(this Document doc, ISpeckleConvert
     /// </summary>
     /// <param name="appId">Id of the application that originally created the element, in AutocadCivil it's the handle</param>
     /// <returns>The element, if found, otherwise null</returns>
+    /// <remarks>
+    /// Updating is super buggy because of limitations to how object handles are generated. 
+    /// See: https://forums.autodesk.com/t5/net/is-the-quot-objectid-quot-unique-in-a-drawing-file/m-p/6527799#M49953
+    /// </remarks>
     public static List<ObjectId> GetObjectsByApplicationId(this Document doc, Transaction tr, string appId)
     {
       var foundObjects = new List<ObjectId>();
 
-      // first see if this appid is a handle (autocad appid)
-      if (Utils.GetHandle(appId, out Handle handle))
-        if (doc.Database.TryGetObjectId(handle, out ObjectId id))
-          return new List<ObjectId>() { id };
+      // first check for custom xdata application ids, because object handles tend to be duplicated
 
       // Create a TypedValue array to define the filter criteria
       TypedValue[] acTypValAr = new TypedValue[1];
@@ -393,25 +415,42 @@ public static List<ObjectId> GetObjectsByApplicationId(this Document doc, Transa
       SelectionFilter acSelFtr = new SelectionFilter(acTypValAr);
       var editor = Application.DocumentManager.MdiActiveDocument.Editor;
       var res = editor.SelectAll(acSelFtr);
-      if (res.Status == PromptStatus.None || res.Status == PromptStatus.Error)
-        return foundObjects;
 
-      // loop through all obj with an appId 
-      foreach (var appIdObj in res.Value.GetObjectIds())
+      if (res.Status != PromptStatus.None && res.Status != PromptStatus.Error)
       {
-        // get the db object from id
-        var obj = tr.GetObject(appIdObj, OpenMode.ForRead);
-        if (obj != null)
-          foreach (var entry in obj.XData)
-            if (entry.Value as string == appId)
+        // loop through all obj with an appId 
+        foreach (var appIdObj in res.Value.GetObjectIds())
+        {
+          // get the db object from id
+          var obj = tr.GetObject(appIdObj, OpenMode.ForRead);
+          if (obj != null)
+          {
+            foreach (var entry in obj.XData)
             {
-              foundObjects.Add(appIdObj);
-              break;
+              if (entry.Value as string == appId)
+              {
+                foundObjects.Add(appIdObj);
+                break;
+              }
             }
+          }
+        }
       }
+      if (foundObjects.Any()) return foundObjects;
 
+      // if no matching xdata appids were found, loop through handles instead
+      if (Utils.GetHandle(appId, out Handle handle))
+        if (doc.Database.TryGetObjectId(handle, out ObjectId id))
+          return id.IsErased ? foundObjects : new List<ObjectId>() { id };
+     
       return foundObjects;
     }
+
+    /// <summary>
+    /// Returns a descriptive string for reporting
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
     public static string ObjectDescriptor(DBObject obj)
     {
       if (obj == null) return String.Empty;
diff --git a/ConnectorAutocadCivil/ConnectorCivil2021/Properties/AssemblyInfo.cs b/ConnectorAutocadCivil/ConnectorCivil2021/Properties/AssemblyInfo.cs
index 75d62f28f4..befe2c6582 100644
--- a/ConnectorAutocadCivil/ConnectorCivil2021/Properties/AssemblyInfo.cs
+++ b/ConnectorAutocadCivil/ConnectorCivil2021/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.0-beta")]
diff --git a/ConnectorAutocadCivil/ConnectorCivil2022/Properties/AssemblyInfo.cs b/ConnectorAutocadCivil/ConnectorCivil2022/Properties/AssemblyInfo.cs
index cc32515821..8a84314fa0 100644
--- a/ConnectorAutocadCivil/ConnectorCivil2022/Properties/AssemblyInfo.cs
+++ b/ConnectorAutocadCivil/ConnectorCivil2022/Properties/AssemblyInfo.cs
@@ -34,4 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.0-beta")]
diff --git a/ConnectorAutocadCivil/ConnectorCivil2023/Properties/AssemblyInfo.cs b/ConnectorAutocadCivil/ConnectorCivil2023/Properties/AssemblyInfo.cs
index 35bdb60d23..274d5ee6f0 100644
--- a/ConnectorAutocadCivil/ConnectorCivil2023/Properties/AssemblyInfo.cs
+++ b/ConnectorAutocadCivil/ConnectorCivil2023/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/ConnectorCSI/ConnectorCSIShared/UI/ConnectorBindingsCSI.Selection.cs b/ConnectorCSI/ConnectorCSIShared/UI/ConnectorBindingsCSI.Selection.cs
index 7bfa950fcc..515b9af722 100644
--- a/ConnectorCSI/ConnectorCSIShared/UI/ConnectorBindingsCSI.Selection.cs
+++ b/ConnectorCSI/ConnectorCSIShared/UI/ConnectorBindingsCSI.Selection.cs
@@ -29,42 +29,47 @@ public override List<string> GetSelectedObjects()
 
     public override List<ISelectionFilter> GetSelectionFilters()
     {
-      var objectTypes = new List<string>();
-      //var objectIds = new List<string>();
-      string[] groupNames = null;
-      var groups = new List<string>();
-      int numNames = 0;
+      var filters = new List<ISelectionFilter>();
+      filters.Add(new AllSelectionFilter
+      {
+        Slug = "all",
+        Name = "Everything",
+        Icon = "CubeScan",
+        Description = "Selects all document objects."
+      });
+      filters.Add(new ManualSelectionFilter());
+
       if (Model != null)
       {
         ConnectorCSIUtils.GetObjectIDsTypesAndNames(Model);
-        objectTypes = ConnectorCSIUtils.ObjectIDsTypesAndNames
+        var objectTypes = ConnectorCSIUtils.ObjectIDsTypesAndNames
             .Select(pair => pair.Value.Item1).Distinct().ToList();
-        //objectIds = ConnectorCSIUtils.ObjectIDsTypesAndNames.Select(pair => pair.Key).ToList();
+        
+        if (objectTypes.Any())
+          filters.Add(new ListSelectionFilter
+          {
+            Slug = "type",
+            Name = "Categories",
+            Icon = "Category",
+            Values = objectTypes,
+            Description = "Adds all objects belonging to the selected types."
+          });
+
+        string[] groupNames = new string[0];
+        int numNames = 0;
         Model.GroupDef.GetNameList(ref numNames, ref groupNames);
-        groups = groupNames.ToList();
+        if (groupNames.Any())
+          filters.Add(new ListSelectionFilter
+          {
+            Slug = "group",
+            Name = "Group",
+            Icon = "SelectGroup",
+            Values = groupNames.ToList(),
+            Description = "Add all objects belonging to CSI Group."
+          });
       }
 
-      return new List<ISelectionFilter>()
-        {
-        new AllSelectionFilter {Slug="all",  Name = "Everything",
-            Icon = "CubeScan", Description = "Selects all document objects." },
-        new ListSelectionFilter {Slug="type", Name = "Categories",
-            Icon = "Category", Values = objectTypes,
-            Description="Adds all objects belonging to the selected types"},
-    //new PropertySelectionFilter{
-    //  Slug="param",
-    //  Name = "Param",
-    //  Description="Adds  all objects satisfying the selected parameter",
-    //  Icon = "FilterList",
-    //  HasCustomProperty = false,
-    //  Values = objectNames,
-    //  Operators = new List<string> {"equals", "contains", "is greater than", "is less than"}
-    //},
-            
-        new ManualSelectionFilter(),
-        new ListSelectionFilter { Slug = "group", Name = "Group",
-        Icon = "SelectGroup", Values = groups, Description = "Add all objects belonging to CSI Group" }
-        };
+      return filters;
     }
 
     public override void SelectClientObjects(List<string> args, bool deselect = false)
@@ -83,8 +88,7 @@ private List<string> GetSelectionFilterObjects(ISelectionFilter filter)
         case "manual":
           return GetSelectedObjects();
         case "all":
-          if (ConnectorCSIUtils.ObjectIDsTypesAndNames == null)
-            ConnectorCSIUtils.GetObjectIDsTypesAndNames(Model);
+          ConnectorCSIUtils.GetObjectIDsTypesAndNames(Model);
 
           selection.AddRange(ConnectorCSIUtils.ObjectIDsTypesAndNames
                       .Select(pair => pair.Key).ToList());
@@ -92,8 +96,7 @@ private List<string> GetSelectionFilterObjects(ISelectionFilter filter)
 
         case "type":
           var typeFilter = filter as ListSelectionFilter;
-          if (ConnectorCSIUtils.ObjectIDsTypesAndNames == null)
-            ConnectorCSIUtils.GetObjectIDsTypesAndNames(Model);
+          ConnectorCSIUtils.GetObjectIDsTypesAndNames(Model);
 
           foreach (var type in typeFilter.Selection)
           {
diff --git a/ConnectorCSI/ConnectorCSIShared/UI/ConnectorBindingsCSI.cs b/ConnectorCSI/ConnectorCSIShared/UI/ConnectorBindingsCSI.cs
index 6aa8777e4e..dbacd44042 100644
--- a/ConnectorCSI/ConnectorCSIShared/UI/ConnectorBindingsCSI.cs
+++ b/ConnectorCSI/ConnectorCSIShared/UI/ConnectorBindingsCSI.cs
@@ -24,7 +24,7 @@ public ConnectorBindingsCSI(cSapModel model)
 
     public override List<ReceiveMode> GetReceiveModes()
     {
-      return new List<ReceiveMode> { ReceiveMode.Create, ReceiveMode.Update };
+      return new List<ReceiveMode> { ReceiveMode.Create };
     }
 
     #region boilerplate
diff --git a/ConnectorCSI/DriverPluginCSharp/DriverPluginCSharp.csproj b/ConnectorCSI/DriverPluginCSharp/DriverPluginCSharp.csproj
index 6aa0cae633..31bf499809 100644
--- a/ConnectorCSI/DriverPluginCSharp/DriverPluginCSharp.csproj
+++ b/ConnectorCSI/DriverPluginCSharp/DriverPluginCSharp.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/SchemaBuilderGen.cs b/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/SchemaBuilderGen.cs
deleted file mode 100644
index 4166da2e73..0000000000
--- a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/SchemaBuilderGen.cs
+++ /dev/null
@@ -1,2547 +0,0 @@
-
-
-using System;
-using Grasshopper.Kernel;
-using ConnectorGrasshopperUtils;
-
-namespace ConnectorGrasshopper {
-// This is generated code:
-public class AdaptiveComponentSchemaComponent: CreateSchemaObjectBase {
-     
-    public AdaptiveComponentSchemaComponent(): base("AdaptiveComponent", "AdaptiveComponent", "Creates a Revit adaptive component by points", "Speckle 2 Revit", "Families") { }
-    
-    public override Guid ComponentGuid => new Guid("71420d27-62d1-f158-edab-a89e54604d76");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.AdaptiveComponent.ctor(System.String,System.String,System.Collections.Generic.List`1[Objects.Geometry.Point],System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.AdaptiveComponent");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class AngleSchemaComponent: CreateSchemaObjectBase {
-     
-    public AngleSchemaComponent(): base("Angle", "Angle", "Creates a Speckle structural angle section profile", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("91df837b-3162-a0de-724d-ea182e77e68c");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Angle.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Angle");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ArchicadBeamSchemaComponent: CreateSchemaObjectBase {
-     
-    public ArchicadBeamSchemaComponent(): base("ArchicadBeam", "ArchicadBeam", "Creates an Archicad Structures beam by curve.", "Speckle 2 Archicad", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("73860182-c94b-d570-f568-1ab73eec8bfd");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Archicad.ArchicadBeam.ctor(Objects.Geometry.Point,Objects.Geometry.Point)","Objects.BuiltElements.Archicad.ArchicadBeam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class AreaSchemaComponent: CreateSchemaObjectBase {
-     
-    public AreaSchemaComponent(): base("Area", "Area", "Creates a Speckle area", "Speckle 2 BIM", "Other") { }
-    
-    public override Guid ComponentGuid => new Guid("b98bd134-1ebd-b805-821c-465f1a25fb4e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Area.ctor(System.String,System.String,Objects.BuiltElements.Level,Objects.Geometry.Point)","Objects.BuiltElements.Area");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class AxisSchemaComponent: CreateSchemaObjectBase {
-     
-    public AxisSchemaComponent(): base("Axis", "Axis", "Creates a Speckle structural axis (a user-defined axis)", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("38fdc896-0404-4961-120f-6e373d19edbc");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Axis.ctor(System.String,Objects.Structural.AxisType,Objects.Geometry.Plane)","Objects.Structural.Geometry.Axis");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class BeamSchemaComponent: CreateSchemaObjectBase {
-     
-    public BeamSchemaComponent(): base("Beam", "Beam", "Creates a Speckle beam", "Speckle 2 BIM", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("5c0a392e-bc1c-cf28-0048-a99ee090ffa1");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Beam.ctor(Objects.ICurve)","Objects.BuiltElements.Beam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class BlockDefinitionSchemaComponent: CreateSchemaObjectBase {
-     
-    public BlockDefinitionSchemaComponent(): base("Block Definition", "Block Definition", "A Speckle Block definition", "Speckle 2 BIM", "Objects.Other") { }
-    
-    public override Guid ComponentGuid => new Guid("91f1164e-b519-d72f-d64b-e68bb14836e3");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.BlockDefinition.ctor(System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Point)","Objects.Other.BlockDefinition");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class BlockInstanceSchemaComponent: CreateSchemaObjectBase {
-     
-    public BlockInstanceSchemaComponent(): base("Block Instance", "Block Instance", "A Speckle Block Instance", "Speckle 2 BIM", "Objects.Other") { }
-    
-    public override Guid ComponentGuid => new Guid("28238ece-f2e0-fe7d-e25f-e8f8cb35e629");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.BlockInstance.ctor(Objects.Other.BlockDefinition,Objects.Other.Transform)","Objects.Other.BlockInstance");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class BraceSchemaComponent: CreateSchemaObjectBase {
-     
-    public BraceSchemaComponent(): base("Brace", "Brace", "Creates a Speckle brace", "Speckle 2 BIM", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("cf5f1dad-80cd-d499-2ef7-6ae1f8d34a5c");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Brace.ctor(Objects.ICurve)","Objects.BuiltElements.Brace");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CatalogueSchemaComponent: CreateSchemaObjectBase {
-     
-    public CatalogueSchemaComponent(): base("Catalogue (by description)", "Catalogue (by description)", "Creates a Speckle structural section profile based on a catalogue section description", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("7e0f97be-7297-64f8-fc85-f43623186129");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Catalogue.ctor(System.String)","Objects.Structural.Properties.Profiles.Catalogue");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Catalogue1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Catalogue1SchemaComponent(): base("Catalogue", "Catalogue", "Creates a Speckle structural section profile", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("1b5a50a5-4b3d-1018-8e3f-bb34ad0af7ff");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Catalogue.ctor(System.String,System.String,System.String,System.String)","Objects.Structural.Properties.Profiles.Catalogue");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CeilingSchemaComponent: CreateSchemaObjectBase {
-     
-    public CeilingSchemaComponent(): base("Ceiling", "Ceiling", "Creates a Speckle ceiling", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("91b38d18-dd01-dfc7-f11d-e3d2c118ff0b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Ceiling.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Ceiling");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ChannelSchemaComponent: CreateSchemaObjectBase {
-     
-    public ChannelSchemaComponent(): base("Channel", "Channel", "Creates a Speckle structural channel section profile", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("40336db1-decb-2ad6-6680-01c457f0f31d");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Channel.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Channel");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CircularSchemaComponent: CreateSchemaObjectBase {
-     
-    public CircularSchemaComponent(): base("Circular", "Circular", "Creates a Speckle structural circular section profile", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("fbf190e3-c085-dfc9-3b49-bcda58ab931f");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Circular.ctor(System.String,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Circular");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ColumnSchemaComponent: CreateSchemaObjectBase {
-     
-    public ColumnSchemaComponent(): base("Column", "Column", "Creates a Speckle column", "Speckle 2 BIM", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("d92fc447-81b6-e595-1905-6239ea13a49b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Column.ctor(Objects.ICurve)","Objects.BuiltElements.Column");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ConcreteSchemaComponent: CreateSchemaObjectBase {
-     
-    public ConcreteSchemaComponent(): base("Concrete", "Concrete", "Creates a Speckle structural material for concrete (to be used in structural analysis models)", "Speckle 2 Structural", "Materials") { }
-    
-    public override Guid ComponentGuid => new Guid("104f1e8d-a551-bb84-e671-3394bc6a4c2b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.Concrete.ctor(System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Boolean,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Materials.Concrete");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSIAreaSpringSchemaComponent: CreateSchemaObjectBase {
-     
-    public CSIAreaSpringSchemaComponent(): base("LinearSpring", "LinearSpring", "Create an CSI AreaSpring", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("f1b019ec-dac8-2669-a790-818aabd77c81");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIAreaSpring.ctor(System.String,System.Double,System.Double,System.Double,Objects.Structural.CSI.Properties.NonLinearOptions,System.String)","Objects.Structural.CSI.Properties.CSIAreaSpring");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSIDiaphragmSchemaComponent: CreateSchemaObjectBase {
-     
-    public CSIDiaphragmSchemaComponent(): base("CSI Diaphragm", "CSI Diaphragm", "Create an CSI Diaphragm", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("97f96eaa-f4f3-ef29-0de3-63829f163dc1");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIDiaphragm.ctor(System.String,System.Boolean)","Objects.Structural.CSI.Properties.CSIDiaphragm");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSIElement1DSchemaComponent: CreateSchemaObjectBase {
-     
-    public CSIElement1DSchemaComponent(): base("Element1D (from local axis)", "Element1D (from local axis)", "Creates a Speckle CSI 1D element (from local axis)", "Speckle 2 CSI", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("b19522f8-4264-ce56-3cc7-ec2132ece2e1");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Geometry.CSIElement1D.ctor(Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Geometry.Plane,Objects.Structural.CSI.Properties.CSILinearSpring,System.Double[],Objects.Structural.CSI.Properties.DesignProcedure)","Objects.Structural.CSI.Geometry.CSIElement1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSIElement1D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public CSIElement1D1SchemaComponent(): base("Element1D (from orientation node and angle)", "Element1D (from orientation node and angle)", "Creates a Speckle CSI 1D element (from orientation node and angle)", "Speckle 2 CSI", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("95254c64-1e71-0902-06a1-206b2f17b844");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Geometry.CSIElement1D.ctor(Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Structural.Geometry.Node,System.Double,Objects.Structural.CSI.Properties.CSILinearSpring,System.Double[],Objects.Structural.CSI.Properties.DesignProcedure)","Objects.Structural.CSI.Geometry.CSIElement1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSIElement2DSchemaComponent: CreateSchemaObjectBase {
-     
-    public CSIElement2DSchemaComponent(): base("Element2D", "Element2D", "Creates a Speckle CSI 2D element (based on a list of edge ie. external, geometry defining nodes)", "Speckle 2 CSI", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("33c58e3c-d8cb-86ca-b494-ee5c69ec7b14");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Geometry.CSIElement2D.ctor(System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Properties.Property2D,System.Double,System.Double,System.Double[],Objects.Structural.CSI.Properties.CSIAreaSpring,Objects.Structural.CSI.Properties.CSIDiaphragm)","Objects.Structural.CSI.Geometry.CSIElement2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSILinearSpringSchemaComponent: CreateSchemaObjectBase {
-     
-    public CSILinearSpringSchemaComponent(): base("LinearSpring", "LinearSpring", "Create an CSI LinearSpring", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("a81ebbcb-78a6-9f21-5212-09701d89fa5d");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSILinearSpring.ctor(System.String,System.Double,System.Double,System.Double,System.Double,Objects.Structural.CSI.Properties.NonLinearOptions,Objects.Structural.CSI.Properties.NonLinearOptions,System.String)","Objects.Structural.CSI.Properties.CSILinearSpring");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSILinkPropertySchemaComponent: CreateSchemaObjectBase {
-     
-    public CSILinkPropertySchemaComponent(): base("CSILink", "CSILink", "Create an CSI Link Property", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("0d7960c0-ddc2-fa77-3b52-fd4d1587af32");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSILinkProperty.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSILinkProperty");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSINodeSchemaComponent: CreateSchemaObjectBase {
-     
-    public CSINodeSchemaComponent(): base("Node with properties", "Node with properties", "Creates a Speckle CSI node with spring, mass and/or damper properties", "Speckle 2 CSI", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("2c39977e-f47f-3202-c778-ac46b8462fea");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Geometry.CSINode.ctor(Objects.Geometry.Point,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Axis,Objects.Structural.CSI.Properties.CSISpringProperty,Objects.Structural.Properties.PropertyMass,Objects.Structural.Properties.PropertyDamper,Objects.Structural.CSI.Properties.CSIDiaphragm,Objects.Structural.CSI.Properties.DiaphragmOption)","Objects.Structural.CSI.Geometry.CSINode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSIOpeningSchemaComponent: CreateSchemaObjectBase {
-     
-    public CSIOpeningSchemaComponent(): base("Opening", "Opening", "Create an CSI Opening", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("e6405aac-40ff-97c5-66d7-be3586eebbdd");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIOpening.ctor(System.Boolean)","Objects.Structural.CSI.Properties.CSIOpening");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSISpringPropertySchemaComponent: CreateSchemaObjectBase {
-     
-    public CSISpringPropertySchemaComponent(): base("PointSpring from Link", "PointSpring from Link", "Create an CSI PointSpring from Link", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("efa38436-affe-3ba9-2413-743fe26eb9f7");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSISpringProperty.ctor(System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSISpringProperty");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class CSISpringProperty1SchemaComponent: CreateSchemaObjectBase {
-     
-    public CSISpringProperty1SchemaComponent(): base("PointSpring from Soil Profile", "PointSpring from Soil Profile", "Create an CSI PointSpring from Soil Profile", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("9b2854b3-f8bc-b8e6-fd86-aa5c55051759");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSISpringProperty.ctor(System.String,System.String,System.String,System.Double)","Objects.Structural.CSI.Properties.CSISpringProperty");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class DeckFilledSchemaComponent: CreateSchemaObjectBase {
-     
-    public DeckFilledSchemaComponent(): base("DeckFilled", "DeckFilled", "Create an CSI Filled Deck", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("151a2166-f739-501f-d3bc-f1a24bdd4093");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+DeckFilled.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+DeckFilled");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class DeckSlabSchemaComponent: CreateSchemaObjectBase {
-     
-    public DeckSlabSchemaComponent(): base("DeckSlab", "DeckSlab", "Create an CSI Slab Deck", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("b8102cde-4ea3-0583-9580-4a9530154440");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+DeckSlab.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+DeckSlab");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class DeckUnFilledSchemaComponent: CreateSchemaObjectBase {
-     
-    public DeckUnFilledSchemaComponent(): base("DeckUnFilled", "DeckUnFilled", "Create an CSI UnFilled Deck", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("680e6f0c-d140-e8c4-27e1-28d353a87b8f");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+DeckUnFilled.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+DeckUnFilled");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class DetailCurveSchemaComponent: CreateSchemaObjectBase {
-     
-    public DetailCurveSchemaComponent(): base("DetailCurve", "DetailCurve", "Creates a Revit detail curve", "Speckle 2 Revit", "Curves") { }
-    
-    public override Guid ComponentGuid => new Guid("4752d321-22cc-2d9e-dc6d-e3cf8e70c612");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Curve.DetailCurve.ctor(Objects.ICurve,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.Curve.DetailCurve");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class DirectShapeSchemaComponent: CreateSchemaObjectBase {
-     
-    public DirectShapeSchemaComponent(): base("DirectShape by base geometries", "DirectShape by base geometries", "Creates a Revit DirectShape using a list of base geometry objects.", "Speckle 2 Revit", "Families") { }
-    
-    public override Guid ComponentGuid => new Guid("870d9670-cbf5-06d2-f371-e1e49212b063");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.DirectShape.ctor(System.String,Objects.BuiltElements.Revit.RevitCategory,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.DirectShape");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class DuctSchemaComponent: CreateSchemaObjectBase {
-     
-    public DuctSchemaComponent(): base("Duct", "Duct", "Creates a Speckle duct", "Speckle 2 BIM", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("51d40791-43ea-a8e7-ef13-e9bfdf9cd893");
-    public override bool Obsolete => true;
-    public override GH_Exposure Exposure => GH_Exposure.hidden;
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Duct.ctor(Objects.Geometry.Line,System.Double,System.Double,System.Double,System.Double)","Objects.BuiltElements.Duct");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Duct1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Duct1SchemaComponent(): base("Duct", "Duct", "Creates a Speckle duct", "Speckle 2 BIM", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("7e3a3fba-7d4f-d549-96c0-41693b512db0");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Duct.ctor(Objects.ICurve,System.Double,System.Double,System.Double,System.Double)","Objects.BuiltElements.Duct");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Element1DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Element1DSchemaComponent(): base("Element1D (from local axis)", "Element1D (from local axis)", "Creates a Speckle structural 1D element (from local axis)", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("9fffb53b-3465-7a5b-4839-91cfdcb86f63");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Element1D.ctor(Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Geometry.Plane)","Objects.Structural.Geometry.Element1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Element1D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Element1D1SchemaComponent(): base("Element1D (from orientation node and angle)", "Element1D (from orientation node and angle)", "Creates a Speckle structural 1D element (from orientation node and angle)", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("6cb2d683-3116-0246-18b0-1bd35ed8fcc6");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Element1D.ctor(Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Structural.Geometry.Node,System.Double)","Objects.Structural.Geometry.Element1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Element2DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Element2DSchemaComponent(): base("Element2D", "Element2D", "Creates a Speckle structural 2D element (based on a list of edge ie. external, geometry defining nodes)", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("0927879c-d28c-1c35-0d3f-4ba8e324ec39");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Element2D.ctor(System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Properties.Property2D,System.Double,System.Double)","Objects.Structural.Geometry.Element2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Element3DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Element3DSchemaComponent(): base("Element3D", "Element3D", "Creates a Speckle structural 3D element", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("54b79bd6-7a50-2107-afd5-f9b18346f8ea");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Element3D.ctor(Objects.Geometry.Mesh,Objects.Structural.Properties.Property3D,Objects.Structural.Geometry.ElementType3D,System.String,System.Double)","Objects.Structural.Geometry.Element3D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ExplicitSchemaComponent: CreateSchemaObjectBase {
-     
-    public ExplicitSchemaComponent(): base("Explicit", "Explicit", "Creates a Speckle structural section profile based on explicitly defining geometric properties", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("e15a7edd-4559-0bb6-3559-48b72c43da2e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Explicit.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Explicit");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class FamilyInstanceSchemaComponent: CreateSchemaObjectBase {
-     
-    public FamilyInstanceSchemaComponent(): base("FamilyInstance", "FamilyInstance", "Creates a Revit family instance", "Speckle 2 Revit", "Families") { }
-    
-    public override Guid ComponentGuid => new Guid("266c4d84-3f2a-9129-565b-0ddb1e5bdac4");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.FamilyInstance.ctor(Objects.Geometry.Point,System.String,System.String,Objects.BuiltElements.Level,System.Double,System.Boolean,System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.FamilyInstance");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class FloorSchemaComponent: CreateSchemaObjectBase {
-     
-    public FloorSchemaComponent(): base("Floor", "Floor", "Creates a Speckle floor", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("74c5b6bf-257e-8d4e-d9cb-7dc2c7ae3f22");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Floor.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Floor");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class FreeformElementSchemaComponent: CreateSchemaObjectBase {
-     
-    public FreeformElementSchemaComponent(): base("Freeform element", "Freeform element", "Creates a Revit Freeform element using a list of Brep or Meshes. Category defaults to Generic Models", "Speckle 2 Revit", "Families") { }
-    
-    public override Guid ComponentGuid => new Guid("b24dc861-1c3c-a509-bc8b-560e9f7d503e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.FreeformElement.ctor(System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.FreeformElement");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class FreeformElement1SchemaComponent: CreateSchemaObjectBase {
-     
-    public FreeformElement1SchemaComponent(): base("Freeform element", "Freeform element", "Creates a Revit Freeform element using a list of Brep or Meshes.", "Speckle 2 Revit", "Families") { }
-    
-    public override Guid ComponentGuid => new Guid("d1bb3f50-6abc-9f34-acf3-297e82bbd8ac");
-    public override bool Obsolete => true;
-    public override GH_Exposure Exposure => GH_Exposure.hidden;
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.FreeformElement.ctor(Speckle.Core.Models.Base,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.FreeformElement");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class FreeformElement2SchemaComponent: CreateSchemaObjectBase {
-     
-    public FreeformElement2SchemaComponent(): base("Freeform element", "Freeform element", "Creates a Revit Freeform element using a list of Brep or Meshes.", "Speckle 2 Revit", "Families") { }
-    
-    public override Guid ComponentGuid => new Guid("d1a2299d-b8b0-ce4a-6a52-8b8ad95acbfd");
-    public override bool Obsolete => true;
-    public override GH_Exposure Exposure => GH_Exposure.hidden;
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.FreeformElement.ctor(System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.FreeformElement");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GridLineSchemaComponent: CreateSchemaObjectBase {
-     
-    public GridLineSchemaComponent(): base("GridLine", "GridLine", "Creates a Speckle grid line", "Speckle 2 BIM", "Other") { }
-    
-    public override Guid ComponentGuid => new Guid("b2d4bd71-86a7-c142-7220-d9ed2ee7b02e");
-    public override bool Obsolete => true;
-    public override GH_Exposure Exposure => GH_Exposure.hidden;
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.GridLine.ctor(Objects.ICurve)","Objects.BuiltElements.GridLine");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GridLine1SchemaComponent: CreateSchemaObjectBase {
-     
-    public GridLine1SchemaComponent(): base("GridLine", "GridLine", "Creates a Speckle grid line with a label", "Speckle 2 BIM", "Other") { }
-    
-    public override Guid ComponentGuid => new Guid("436f3773-b3f9-1a35-684e-a75f25f6c3bd");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.GridLine.ctor(Objects.ICurve,System.String)","Objects.BuiltElements.GridLine");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAAlignmentSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAAlignmentSchemaComponent(): base("GSAAlignment", "GSAAlignment", "Creates a Speckle structural alignment for GSA (as a setting out feature for bridge models)", "Speckle 2 GSA", "Bridge") { }
-    
-    public override Guid ComponentGuid => new Guid("fc274806-efb5-c3b2-9c1d-bc9a6aba1a34");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAAlignment.ctor(System.Int32,System.String,Objects.Structural.GSA.Geometry.GSAGridSurface,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Bridge.GSAAlignment");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAAnalysisCaseSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAAnalysisCaseSchemaComponent(): base("GSAAnalysisCase", "GSAAnalysisCase", "Creates a Speckle structural analysis case for GSA", "Speckle 2 GSA", "Analysis") { }
-    
-    public override Guid ComponentGuid => new Guid("4bfc261f-98eb-7b2a-5da6-f2ef3505b9b7");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Analysis.GSAAnalysisCase.ctor(System.Int32,System.String,Objects.Structural.GSA.Analysis.GSATask,System.Collections.Generic.List`1[Objects.Structural.Loading.LoadCase],System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Analysis.GSAAnalysisCase");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAAssemblySchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAAssemblySchemaComponent(): base("GSAAssembly", "GSAAssembly", "Creates a Speckle structural assembly (ie. a way to define an entity that is formed from a collection of elements or members) for GSA", "Speckle 2 GSA", "Bridge") { }
-    
-    public override Guid ComponentGuid => new Guid("9b2c7be3-5172-7660-659a-e39253688363");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAAssembly.ctor(System.Int32,System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.GSA.Geometry.GSANode,Objects.Structural.GSA.Geometry.GSANode,Objects.Structural.GSA.Geometry.GSANode,System.Double,System.Double,System.String,System.Int32,System.String,System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Geometry.GSAAssembly");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAConcreteSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAConcreteSchemaComponent(): base("GSAConcrete", "GSAConcrete", "Creates a Speckle structural concrete material for GSA", "Speckle 2 GSA", "Materials") { }
-    
-    public override Guid ComponentGuid => new Guid("a86c1d31-6807-f465-c51c-24d5d7a5a728");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Materials.GSAConcrete.ctor(System.Int32,System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Boolean,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.String)","Objects.Structural.GSA.Materials.GSAConcrete");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAElement1DSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAElement1DSchemaComponent(): base("GSAElement1D (from local axis)", "GSAElement1D (from local axis)", "Creates a Speckle structural 1D element for GSA (from local axis)", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("8b41c9e5-f24b-f0bc-7b62-169f839883ec");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAElement1D.ctor(System.Int32,Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Geometry.Plane)","Objects.Structural.GSA.Geometry.GSAElement1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAElement1D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAElement1D1SchemaComponent(): base("GSAElement1D (from orientation node and angle)", "GSAElement1D (from orientation node and angle)", "Creates a Speckle structural 1D element for GSA (from orientation node and angle)", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("d3ff71ed-34b8-6f9b-7ebc-50ff8195d1b2");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAElement1D.ctor(System.Int32,Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Structural.Geometry.Node,System.Double)","Objects.Structural.GSA.Geometry.GSAElement1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAElement2DSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAElement2DSchemaComponent(): base("GSAElement2D", "GSAElement2D", "Creates a Speckle structural 2D element for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("9a1c5132-a785-c389-fe5f-441820f07446");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAElement2D.ctor(System.Int32,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Properties.Property2D,Objects.Structural.Geometry.ElementType2D,System.String,System.Double,System.Double,System.Int32,System.String,System.Boolean)","Objects.Structural.GSA.Geometry.GSAElement2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAElement3DSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAElement3DSchemaComponent(): base("GSAElement3D", "GSAElement3D", "Creates a Speckle structural 3D element for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("3fb3f410-62f0-f972-de47-4e55d8aee0b6");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAElement3D.ctor(System.Int32,Objects.Geometry.Mesh,Objects.Structural.Properties.Property3D,Objects.Structural.Geometry.ElementType3D,System.String,System.Double,System.Int32,System.String,System.Boolean)","Objects.Structural.GSA.Geometry.GSAElement3D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAGeneralisedRestraintSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAGeneralisedRestraintSchemaComponent(): base("GSAGeneralisedRestraint", "GSAGeneralisedRestraint", "Creates a Speckle structural generalised restraint (a set of restraint conditions to be applied to a list of nodes) for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("e3b018a2-2196-d3aa-a66a-3248343143aa");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAGeneralisedRestraint.ctor(System.Int32,System.String,Objects.Structural.Geometry.Restraint,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],System.Collections.Generic.List`1[Objects.Structural.GSA.Analysis.GSAStage])","Objects.Structural.GSA.Geometry.GSAGeneralisedRestraint");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAGridLineSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAGridLineSchemaComponent(): base("GSAGridLine", "GSAGridLine", "Creates a Speckle structural grid line for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("1fdfd333-8214-4f28-1835-7609247412ac");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAGridLine.ctor(System.Int32,System.String,Objects.ICurve)","Objects.Structural.GSA.Geometry.GSAGridLine");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAGridPlaneSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAGridPlaneSchemaComponent(): base("GSAGridPlane", "GSAGridPlane", "Creates a Speckle structural grid plane for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("f7db7fc7-c05e-c257-c11c-7d3a3e7ecdfc");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAGridPlane.ctor(System.Int32,System.String,Objects.Structural.Geometry.Axis,System.Double)","Objects.Structural.GSA.Geometry.GSAGridPlane");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAGridSurfaceSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAGridSurfaceSchemaComponent(): base("GSAGridSurface", "GSAGridSurface", "Creates a Speckle structural grid surface for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("868d0f73-da31-e362-f5c5-c2e5a98f0f46");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAGridSurface.ctor(System.String,System.Int32,Objects.Structural.GSA.Geometry.GSAGridPlane,System.Double,System.Double,Objects.Structural.GSA.Geometry.LoadExpansion,Objects.Structural.GSA.Geometry.GridSurfaceSpanType,System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.Structural.GSA.Geometry.GSAGridSurface");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAInfluenceBeamSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAInfluenceBeamSchemaComponent(): base("GSAInfluenceBeam", "GSAInfluenceBeam", "Creates a Speckle structural beam influence effect for GSA (for an influence analysis)", "Speckle 2 GSA", "Bridge") { }
-    
-    public override Guid ComponentGuid => new Guid("8844e443-368c-0b7d-89d8-fc563aa7a56d");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAInfluenceBeam.ctor(System.Int32,System.String,System.Double,Objects.Structural.GSA.Bridge.InfluenceType,Objects.Structural.Loading.LoadDirection,Objects.Structural.GSA.Geometry.GSAElement1D,System.Double)","Objects.Structural.GSA.Bridge.GSAInfluenceBeam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAInfluenceNodeSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAInfluenceNodeSchemaComponent(): base("GSAInfluenceBeam", "GSAInfluenceBeam", "Creates a Speckle structural node influence effect for GSA (for an influence analysis)", "Speckle 2 GSA", "Bridge") { }
-    
-    public override Guid ComponentGuid => new Guid("61efde90-bb48-abf4-e69a-87376cab33bd");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAInfluenceNode.ctor(System.Int32,System.String,System.Double,Objects.Structural.GSA.Bridge.InfluenceType,Objects.Structural.Loading.LoadDirection,Objects.Structural.Geometry.Node,Objects.Structural.Geometry.Axis)","Objects.Structural.GSA.Bridge.GSAInfluenceNode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadBeamSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadBeamSchemaComponent(): base("GSALoadBeam", "GSALoadBeam", "Creates a Speckle structural beam (1D elem/member) load for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("eb5a5098-d189-58ab-d032-60dfdd6e5495");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadBeam.ctor(System.Int32,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.BeamLoadType,Objects.Structural.Loading.LoadDirection,Objects.Structural.LoadAxisType,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean)","Objects.Structural.GSA.Loading.GSALoadBeam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadBeam1SchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadBeam1SchemaComponent(): base("GSALoadBeam (user-defined axis)", "GSALoadBeam (user-defined axis)", "Creates a Speckle structural beam (1D elem/member) load (specified for a user-defined axis) for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("29927efe-6612-a3f7-a0c7-49ef97bea3ae");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadBeam.ctor(System.Int32,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.BeamLoadType,Objects.Structural.Loading.LoadDirection,Objects.Structural.Geometry.Axis,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean)","Objects.Structural.GSA.Loading.GSALoadBeam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadCaseSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadCaseSchemaComponent(): base("GSALoadCase", "GSALoadCase", "Creates a Speckle structural load case for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("3d862f90-6804-d75c-a0e2-8e90c9b190db");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadCase.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadType,Objects.Structural.Loading.LoadDirection2D,System.String,Objects.Structural.Loading.ActionType,System.String,System.String,System.Boolean)","Objects.Structural.GSA.Loading.GSALoadCase");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadCombinationSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadCombinationSchemaComponent(): base("GSALoadCombination", "GSALoadCombination", "Creates a Speckle load combination for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("a79c8825-221a-d44f-5faa-b257f3f6c98e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadCombination.ctor(System.Int32,System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Loading.GSALoadCombination");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadFaceSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadFaceSchemaComponent(): base("GSALoadFace", "GSALoadFace", "Creates a Speckle structural face (2D elem/member) load for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("abc889bd-7235-5b08-9f91-124a4dd94c7a");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadFace.ctor(System.Int32,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.FaceLoadType,Objects.Structural.Loading.LoadDirection2D,Objects.Structural.LoadAxisType,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean)","Objects.Structural.GSA.Loading.GSALoadFace");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadGravitySchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadGravitySchemaComponent(): base("GSALoadGravity", "GSALoadGravity", "Creates a Speckle structural gravity load (applied to all nodes and elements) for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("a49dd14b-f073-b628-f175-030c5cee8d3b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadGravity.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,Objects.Geometry.Vector)","Objects.Structural.GSA.Loading.GSALoadGravity");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadGravity1SchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadGravity1SchemaComponent(): base("GSALoadGravity (specified elements)", "GSALoadGravity (specified elements)", "Creates a Speckle structural gravity load (applied to specified elements) for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("6b27dc40-c384-1058-d7ab-eaf6bcd19587");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadGravity.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Vector)","Objects.Structural.GSA.Loading.GSALoadGravity");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadGravity2SchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadGravity2SchemaComponent(): base("GSALoadGravity (specified elements and nodes)", "GSALoadGravity (specified elements and nodes)", "Creates a Speckle structural gravity load (applied to specified nodes and elements) for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("05096aa4-f73a-01d0-5613-1184349cb0ea");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadGravity.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Vector,System.String)","Objects.Structural.GSA.Loading.GSALoadGravity");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadNodeSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadNodeSchemaComponent(): base("GSALoadNode", "GSALoadNode", "Creates a Speckle node load for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("8a591a6c-207c-f42a-d2f4-596594a536a7");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadNode.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Objects.Structural.GSA.Geometry.GSANode],Objects.Structural.Loading.LoadDirection,System.Double)","Objects.Structural.GSA.Loading.GSALoadNode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSALoadNode1SchemaComponent: CreateSchemaObjectBase {
-     
-    public GSALoadNode1SchemaComponent(): base("GSALoadNode (user-defined axis)", "GSALoadNode (user-defined axis)", "Creates a Speckle node load (user-defined axis) for GSA", "Speckle 2 GSA", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("d641ad56-fa70-fd1f-7066-412a8e15970e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadNode.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Geometry.Axis,Objects.Structural.Loading.LoadDirection,System.Double)","Objects.Structural.GSA.Loading.GSALoadNode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAMaterialSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAMaterialSchemaComponent(): base("GSAMaterial", "GSAMaterial", "Creates a Speckle structural material for GSA", "Speckle 2 GSA", "Materials") { }
-    
-    public override Guid ComponentGuid => new Guid("6e7d020a-4a4b-9f9a-f573-222476220b2c");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Materials.GSAMaterial.ctor(System.Int32,System.String,Objects.Structural.MaterialType,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.String)","Objects.Structural.GSA.Materials.GSAMaterial");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAMember1DSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAMember1DSchemaComponent(): base("GSAMember1D (from local axis)", "GSAMember1D (from local axis)", "Creates a Speckle structural 1D member for GSA (from local axis)", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("e86d92aa-cefd-5a09-138d-a1cd1fe36e7d");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAMember1D.ctor(System.Int32,Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Geometry.Plane)","Objects.Structural.GSA.Geometry.GSAMember1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAMember1D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAMember1D1SchemaComponent(): base("GSAMember1D (from orientation node and angle)", "GSAMember1D (from orientation node and angle)", "Creates a Speckle structural 1D member for GSA (from orientation node and angle)", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("7c4f3597-5d45-eb1e-c7e9-c3a4dfb9a240");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAMember1D.ctor(System.Int32,Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Structural.GSA.Geometry.GSANode,System.Double)","Objects.Structural.GSA.Geometry.GSAMember1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAMember2DSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAMember2DSchemaComponent(): base("GSAMember2D", "GSAMember2D", "Creates a Speckle structural 2D member for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("3b367574-1c20-77d0-c4e8-46979f8a3f42");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAMember2D.ctor(System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Properties.Property2D,Objects.Structural.Geometry.ElementType2D,System.Collections.Generic.List`1[System.Collections.Generic.List`1[Objects.Structural.Geometry.Node]],System.Double,System.Double)","Objects.Structural.GSA.Geometry.GSAMember2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSANodeSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSANodeSchemaComponent(): base("GSANode", "GSANode", "Creates a Speckle structural node for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("3b6c01e9-4d99-90a8-357e-def8c043faa0");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSANode.ctor(System.Int32,Objects.Geometry.Point,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Axis,Objects.Structural.Properties.PropertySpring,Objects.Structural.Properties.PropertyMass,Objects.Structural.Properties.PropertyDamper,System.Double,System.String)","Objects.Structural.GSA.Geometry.GSANode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAPathSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAPathSchemaComponent(): base("GSAPath", "GSAPath", "Creates a Speckle structural path for GSA (a path defines traffic lines along a bridge relative to an alignments, for influence analysis)", "Speckle 2 GSA", "Bridge") { }
-    
-    public override Guid ComponentGuid => new Guid("f6c0f7f0-b742-f8ca-ebc4-0872bfd0517c");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAPath.ctor(System.Int32,System.String,Objects.Structural.GSA.Bridge.PathType,System.Int32,Objects.Structural.GSA.Bridge.GSAAlignment,System.Double,System.Double,System.Double,System.Int32)","Objects.Structural.GSA.Bridge.GSAPath");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAPolylineSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAPolylineSchemaComponent(): base("GSAPolyline", "GSAPolyline", "Creates a Speckle structural polyline for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("e1e8bcb7-7a12-79be-d15f-c2a2bc9ad6df");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSAPolyline.ctor(System.String,System.Int32,System.Collections.Generic.IEnumerable`1[System.Double],System.String,Objects.Structural.GSA.Geometry.GSAGridPlane)","Objects.Structural.GSA.Loading.GSAPolyline");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAProperty1DSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAProperty1DSchemaComponent(): base("GSAProperty1D", "GSAProperty1D", "Creates a Speckle structural 1D element property for GSA", "Speckle 2 GSA", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("347df789-96b7-21f2-fc2f-5bfd26dfbe6f");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Properties.GSAProperty1D.ctor(System.Int32,System.String,Objects.Structural.Materials.StructuralMaterial,Objects.Structural.Properties.Profiles.SectionProfile,System.Double,System.Double)","Objects.Structural.GSA.Properties.GSAProperty1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAProperty2DSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAProperty2DSchemaComponent(): base("GSAProperty2D", "GSAProperty2D", "Creates a Speckle structural 2D element property for GSA", "Speckle 2 GSA", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("562e2664-bdf3-8b98-6e09-cc6584cf2146");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Properties.GSAProperty2D.ctor(System.Int32,System.String,Objects.Structural.Materials.StructuralMaterial,System.Double)","Objects.Structural.GSA.Properties.GSAProperty2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSARigidConstraintSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSARigidConstraintSchemaComponent(): base("GSARigidConstraint", "GSARigidConstraint", "Creates a Speckle structural rigid restraint (a set of nodes constrained to move as a rigid body) for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("fd5845ec-2b73-db4d-8c8f-01d9c7c7d0bb");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSARigidConstraint.ctor(System.String,System.Int32,Objects.Structural.Geometry.Node,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Speckle.Core.Models.Base,System.Collections.Generic.List`1[Objects.Structural.GSA.Analysis.GSAStage],Objects.Structural.GSA.Geometry.LinkageType,System.Collections.Generic.Dictionary`2[Objects.Structural.GSA.Geometry.AxisDirection6,System.Collections.Generic.List`1[Objects.Structural.GSA.Geometry.AxisDirection6]])","Objects.Structural.GSA.Geometry.GSARigidConstraint");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAStageSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAStageSchemaComponent(): base("GSAStage", "GSAStage", "Creates a Speckle structural analysis stage for GSA", "Speckle 2 GSA", "Analysis") { }
-    
-    public override Guid ComponentGuid => new Guid("0f7bf991-1225-1cea-5543-7dea926b1089");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Analysis.GSAStage.ctor(System.Int32,System.String,System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Double,System.Int32,System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.Structural.GSA.Analysis.GSAStage");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSASteelSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSASteelSchemaComponent(): base("Steel", "Steel", "Creates a Speckle structural material for steel (to be used in structural analysis models)", "Speckle 2 Structural", "Materials") { }
-    
-    public override Guid ComponentGuid => new Guid("073f9f26-2cfb-9f2d-fbcd-67ce9904872e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Materials.GSASteel.ctor(System.Int32,System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.String)","Objects.Structural.GSA.Materials.GSASteel");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAStoreySchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAStoreySchemaComponent(): base("GSAStorey", "GSAStorey", "Creates a Speckle structural storey (to describe floor levels/storeys in the structural model) for GSA", "Speckle 2 GSA", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("24bd70e1-024d-538c-8132-d02c4c101e5d");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAStorey.ctor(System.Int32,System.String,Objects.Structural.Geometry.Axis,System.Double,System.Double,System.Double)","Objects.Structural.GSA.Geometry.GSAStorey");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSATaskSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSATaskSchemaComponent(): base("GSAAnalysisTask", "GSAAnalysisTask", "Creates a Speckle structural analysis task for GSA", "Speckle 2 GSA", "Analysis") { }
-    
-    public override Guid ComponentGuid => new Guid("958d20e6-b44e-1dbc-4df3-6dee9b9e13bb");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Analysis.GSATask.ctor(System.Int32,System.String)","Objects.Structural.GSA.Analysis.GSATask");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class GSAUserVehicleSchemaComponent: CreateSchemaObjectBase {
-     
-    public GSAUserVehicleSchemaComponent(): base("GSAUserVehicle", "GSAUserVehicle", "Creates a Speckle structural user-defined vehicle (as a pattern of loading based on axle and wheel positions, for influence analysis) for GSA", "Speckle 2 GSA", "Bridge") { }
-    
-    public override Guid ComponentGuid => new Guid("891ecc6d-cf2a-a476-d94c-f31b51eff020");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAUserVehicle.ctor(System.Int32,System.String,System.Double,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Bridge.GSAUserVehicle");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ISectionSchemaComponent: CreateSchemaObjectBase {
-     
-    public ISectionSchemaComponent(): base("ISection", "ISection", "Creates a Speckle structural I section profile", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("321c4075-d631-8957-9daf-244e6374d73e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.ISection.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.ISection");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LevelSchemaComponent: CreateSchemaObjectBase {
-     
-    public LevelSchemaComponent(): base("Level", "Level", "Creates a Speckle level", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("04fca79a-ae5b-6ac4-581d-79438351a4e8");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Level.ctor(System.String,System.Double)","Objects.BuiltElements.Level");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadBeamSchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadBeamSchemaComponent(): base("Beam Load", "Beam Load", "Creates a Speckle structural beam (1D elem/member) load", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("5aa7c096-d596-e901-49cd-94df21f0f4c9");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadBeam.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.BeamLoadType,Objects.Structural.Loading.LoadDirection,Objects.Structural.LoadAxisType,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean,System.String)","Objects.Structural.Loading.LoadBeam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadBeam1SchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadBeam1SchemaComponent(): base("Beam Load (user-defined axis)", "Beam Load (user-defined axis)", "Creates a Speckle structural beam (1D elem/member) load (specified using a user-defined axis)", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("a84bb64f-5fdc-13b4-bd37-99fa6ee8260a");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadBeam.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.BeamLoadType,Objects.Structural.Loading.LoadDirection,Objects.Structural.Geometry.Axis,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean,System.String)","Objects.Structural.Loading.LoadBeam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadCaseSchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadCaseSchemaComponent(): base("Load Case", "Load Case", "Creates a Speckle structural load case", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("6436c6fd-e4e3-b78a-75f5-d967dc2550fc");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadCase.ctor(System.String,Objects.Structural.Loading.LoadType,System.String,Objects.Structural.Loading.ActionType,System.String)","Objects.Structural.Loading.LoadCase");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadCombinationSchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadCombinationSchemaComponent(): base("Load Combination", "Load Combination", "Creates a Speckle load combination", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("fdbef7a9-adba-eeed-cb4f-9d9799e16da7");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadCombination.ctor(System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[System.Double],Objects.Structural.Loading.CombinationType)","Objects.Structural.Loading.LoadCombination");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadFaceSchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadFaceSchemaComponent(): base("Face Load", "Face Load", "Creates a Speckle structural face (2D elem/member) load", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("9bc9c37f-a304-15dc-76ce-17fced07fa46");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadFace.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.FaceLoadType,Objects.Structural.Loading.LoadDirection2D,Objects.Structural.LoadAxisType,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean,System.String)","Objects.Structural.Loading.LoadFace");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadFace1SchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadFace1SchemaComponent(): base("Face Load (user-defined axis)", "Face Load (user-defined axis)", "Creates a Speckle structural face (2D elem/member) load (specified using a user-defined axis)", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("ad3f7cf4-8c06-10ce-39a2-895ab8a9a475");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadFace.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.FaceLoadType,Objects.Structural.Loading.LoadDirection2D,Objects.Structural.Geometry.Axis,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean,System.String)","Objects.Structural.Loading.LoadFace");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadGravitySchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadGravitySchemaComponent(): base("Gravity Load (all elements)", "Gravity Load (all elements)", "Creates a Speckle structural gravity load (applied to all nodes and elements)", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("f29ce365-1d94-af6d-cf2d-455043fba7a4");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadGravity.ctor(Objects.Structural.Loading.LoadCase,Objects.Geometry.Vector,System.String)","Objects.Structural.Loading.LoadGravity");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadGravity1SchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadGravity1SchemaComponent(): base("Gravity Load (specified elements)", "Gravity Load (specified elements)", "Creates a Speckle structural gravity load (applied to specified elements)", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("a916973a-2052-a4b5-9184-2e76e0059e65");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadGravity.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Vector,System.String)","Objects.Structural.Loading.LoadGravity");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadGravity2SchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadGravity2SchemaComponent(): base("Gravity Load (specified elements and nodes)", "Gravity Load (specified elements and nodes)", "Creates a Speckle structural gravity load (applied to specified nodes and elements)", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("0a4e16ba-52e5-38d9-dce6-630e15528828");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadGravity.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Vector,System.String)","Objects.Structural.Loading.LoadGravity");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadNodeSchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadNodeSchemaComponent(): base("Node Load", "Node Load", "Creates a Speckle node load", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("3d5a37ee-3ce8-8dc6-0efb-7c81bb9d4588");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadNode.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Loading.LoadDirection,System.Double,System.String)","Objects.Structural.Loading.LoadNode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class LoadNode1SchemaComponent: CreateSchemaObjectBase {
-     
-    public LoadNode1SchemaComponent(): base("Node Load (user-defined axis)", "Node Load (user-defined axis)", "Creates a Speckle node load (specifed using a user-defined axis)", "Speckle 2 Structural", "Loading") { }
-    
-    public override Guid ComponentGuid => new Guid("cbbfa332-f0f7-0470-a9f7-7a81813075ad");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadNode.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Geometry.Axis,Objects.Structural.Loading.LoadDirection,System.Double,System.String)","Objects.Structural.Loading.LoadNode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class MaterialSchemaComponent: CreateSchemaObjectBase {
-     
-    public MaterialSchemaComponent(): base("RevitMaterial", "RevitMaterial", "Creates a Speckle material", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("a2ec94ca-c50c-01bf-3d12-0c8feb41004b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.Material.ctor(System.String)","Objects.Other.Material");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class MaterialQuantitySchemaComponent: CreateSchemaObjectBase {
-     
-    public MaterialQuantitySchemaComponent(): base("MaterialQuantity", "MaterialQuantity", "Creates the quantity of a material", "Speckle 2 BIM", "Objects.Other") { }
-    
-    public override Guid ComponentGuid => new Guid("c94a9777-99bb-d501-281a-c10300309038");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.MaterialQuantity.ctor(Objects.Other.Material,System.Double,System.Double,System.String)","Objects.Other.MaterialQuantity");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ModelSchemaComponent: CreateSchemaObjectBase {
-     
-    public ModelSchemaComponent(): base("Model", "Model", "Creates a Speckle structural model object", "Speckle 2 Structural", "Analysis") { }
-    
-    public override Guid ComponentGuid => new Guid("af7f27db-7897-fcad-1839-3b5213188ef8");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.Model.ctor(Objects.Structural.Analysis.ModelInfo,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.Structural.Analysis.Model");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ModelCurveSchemaComponent: CreateSchemaObjectBase {
-     
-    public ModelCurveSchemaComponent(): base("ModelCurve", "ModelCurve", "Creates a Revit model curve", "Speckle 2 Revit", "Curves") { }
-    
-    public override Guid ComponentGuid => new Guid("7aa6e073-6783-8e7b-eec2-7b7bb0420db2");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Curve.ModelCurve.ctor(Objects.ICurve,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.Curve.ModelCurve");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ModelInfoSchemaComponent: CreateSchemaObjectBase {
-     
-    public ModelInfoSchemaComponent(): base("ModelInfo", "ModelInfo", "Creates a Speckle object which describes basic model and project information for a structural model", "Speckle 2 Structural", "Analysis") { }
-    
-    public override Guid ComponentGuid => new Guid("f9da0acf-e2ee-8d25-662f-f5b9928ff8aa");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.ModelInfo.ctor(System.String,System.String,System.String,System.String,Objects.Structural.Analysis.ModelSettings,System.String,System.String)","Objects.Structural.Analysis.ModelInfo");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ModelSettingsSchemaComponent: CreateSchemaObjectBase {
-     
-    public ModelSettingsSchemaComponent(): base("ModelSettings", "ModelSettings", "Creates a Speckle object which describes design and analysis settings for the structural model", "Speckle 2 Structural", "Analysis") { }
-    
-    public override Guid ComponentGuid => new Guid("2f8c73cc-0692-3fd9-a825-7e0677164975");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.ModelSettings.ctor(Objects.Structural.Analysis.ModelUnits,System.String,System.String,System.Double)","Objects.Structural.Analysis.ModelSettings");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ModelUnitsSchemaComponent: CreateSchemaObjectBase {
-     
-    public ModelUnitsSchemaComponent(): base("ModelUnits", "ModelUnits", "Creates a Speckle object which specifies the units associated with the model", "Speckle 2 Structural", "Analysis") { }
-    
-    public override Guid ComponentGuid => new Guid("6c3340f9-3493-5e35-7272-e6acd0eefa85");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.ModelUnits.ctor(Objects.Structural.Analysis.UnitsType)","Objects.Structural.Analysis.ModelUnits");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ModelUnits1SchemaComponent: CreateSchemaObjectBase {
-     
-    public ModelUnits1SchemaComponent(): base("ModelUnits (custom)", "ModelUnits (custom)", "Creates a Speckle object which specifies the units associated with the model", "Speckle 2 Structural", "Analysis") { }
-    
-    public override Guid ComponentGuid => new Guid("162c2a99-e4c9-314f-1833-f0e4a5c7451d");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.ModelUnits.ctor(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)","Objects.Structural.Analysis.ModelUnits");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class NodeSchemaComponent: CreateSchemaObjectBase {
-     
-    public NodeSchemaComponent(): base("Node with properties", "Node with properties", "Creates a Speckle structural node with spring, mass and/or damper properties", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("dacc1582-c084-4685-981a-6f8f8d8663c8");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Node.ctor(Objects.Geometry.Point,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Axis,Objects.Structural.Properties.PropertySpring,Objects.Structural.Properties.PropertyMass,Objects.Structural.Properties.PropertyDamper)","Objects.Structural.Geometry.Node");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class OpeningSchemaComponent: CreateSchemaObjectBase {
-     
-    public OpeningSchemaComponent(): base("Arch Opening", "Arch Opening", "Creates a Speckle opening", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("087f847f-6f51-3cc9-5b7d-2cce478b46f4");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Opening.ctor(Objects.ICurve)","Objects.BuiltElements.Opening");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ParameterSchemaComponent: CreateSchemaObjectBase {
-     
-    public ParameterSchemaComponent(): base("Parameter", "Parameter", "A Revit instance parameter to set on an element", "Speckle 2 Revit", "Families") { }
-    
-    public override Guid ComponentGuid => new Guid("706f3fe9-f499-b07f-b682-febedbe38c9c");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Parameter.ctor(System.String,System.Object,System.String)","Objects.BuiltElements.Revit.Parameter");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ParameterUpdaterSchemaComponent: CreateSchemaObjectBase {
-     
-    public ParameterUpdaterSchemaComponent(): base("ParameterUpdater", "ParameterUpdater", "Updates parameters on a Revit element by id", "Speckle 2 Revit", "Families") { }
-    
-    public override Guid ComponentGuid => new Guid("c4f5fc69-58e1-59f6-4dac-e31b738f7254");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.ParameterUpdater.ctor(System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.ParameterUpdater");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PerimeterSchemaComponent: CreateSchemaObjectBase {
-     
-    public PerimeterSchemaComponent(): base("Perimeter", "Perimeter", "Creates a Speckle structural section profile defined by a perimeter curve and, if applicable, a list of void curves", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("63b41dcc-8f2e-b900-be8a-82a661e56f19");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Perimeter.ctor(System.String,Objects.ICurve,System.Collections.Generic.List`1[Objects.ICurve])","Objects.Structural.Properties.Profiles.Perimeter");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PipeSchemaComponent: CreateSchemaObjectBase {
-     
-    public PipeSchemaComponent(): base("Pipe", "Pipe", "Creates a Speckle pipe", "Speckle 2 BIM", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("6892cf99-6913-7004-27ab-2cfb8435a644");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Pipe.ctor(Objects.ICurve,System.Double,System.Double,System.Double,System.Double)","Objects.BuiltElements.Pipe");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PropertySchemaComponent: CreateSchemaObjectBase {
-     
-    public PropertySchemaComponent(): base("Property", "Property", "Creates a Speckle structural property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("8f7a7ef0-dbe1-4085-a1e8-f602612698a5");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property.ctor(System.String)","Objects.Structural.Properties.Property");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Property1DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Property1DSchemaComponent(): base("Property1D (by name)", "Property1D (by name)", "Creates a Speckle structural 1D element property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("fa29bbb6-ab8f-a235-67da-c10fe9daa077");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property1D.ctor(System.String)","Objects.Structural.Properties.Property1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Property1D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Property1D1SchemaComponent(): base("Property1D", "Property1D", "Creates a Speckle structural 1D element property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("301fb47d-9a12-ed72-4dbf-55d23ac5c432");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property1D.ctor(System.String,Objects.Structural.Materials.StructuralMaterial,Objects.Structural.Properties.Profiles.SectionProfile)","Objects.Structural.Properties.Property1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Property2DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Property2DSchemaComponent(): base("Property2D (by name)", "Property2D (by name)", "Creates a Speckle structural 2D element property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("b637985b-c4b8-0bbd-109b-7caf9fea829f");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property2D.ctor(System.String)","Objects.Structural.Properties.Property2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Property2D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Property2D1SchemaComponent(): base("Property2D", "Property2D", "Creates a Speckle structural 2D element property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("a1f72576-5106-26da-625e-6c5dfe798b4f");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property2D.ctor(System.String,Objects.Structural.Materials.StructuralMaterial,Objects.Structural.PropertyType2D,System.Double)","Objects.Structural.Properties.Property2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Property3DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Property3DSchemaComponent(): base("Property3D (by name)", "Property3D (by name)", "Creates a Speckle structural 3D element property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("a1644434-1c43-113c-786e-c1942f56d205");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property3D.ctor(System.String)","Objects.Structural.Properties.Property3D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Property3D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Property3D1SchemaComponent(): base("Property3D", "Property3D", "Creates a Speckle structural 3D element property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("5cc8c1d0-c3a7-0c95-f2b6-f8f7b4afdc95");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property3D.ctor(System.String,Objects.Structural.PropertyType3D,Objects.Structural.Materials.StructuralMaterial)","Objects.Structural.Properties.Property3D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PropertyDamperSchemaComponent: CreateSchemaObjectBase {
-     
-    public PropertyDamperSchemaComponent(): base("PropertyDamper", "PropertyDamper", "Creates a Speckle structural damper property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("3d966901-7bcc-b5d0-c5c9-060ae5a2caff");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertyDamper.ctor(System.String)","Objects.Structural.Properties.PropertyDamper");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PropertyDamper1SchemaComponent: CreateSchemaObjectBase {
-     
-    public PropertyDamper1SchemaComponent(): base("PropertyDamper (general)", "PropertyDamper (general)", "Creates a Speckle structural damper property (for 6 degrees of freedom)", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("10534d96-587f-e36f-3a97-db6b3fae6b53");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertyDamper.ctor(System.String,Objects.Structural.PropertyTypeDamper,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.PropertyDamper");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PropertyMassSchemaComponent: CreateSchemaObjectBase {
-     
-    public PropertyMassSchemaComponent(): base("PropertyMass", "PropertyMass", "Creates a Speckle structural mass property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("2ab5d65b-d4d7-85fa-01bf-2384c5ce5666");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertyMass.ctor(System.String)","Objects.Structural.Properties.PropertyMass");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PropertyMass1SchemaComponent: CreateSchemaObjectBase {
-     
-    public PropertyMass1SchemaComponent(): base("PropertyMass (general)", "PropertyMass (general)", "Creates a Speckle structural mass property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("66fb8c7a-804c-06d2-a6e0-5da60241dc48");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertyMass.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Boolean,System.Double,System.Double,System.Double)","Objects.Structural.Properties.PropertyMass");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PropertySpringSchemaComponent: CreateSchemaObjectBase {
-     
-    public PropertySpringSchemaComponent(): base("PropertySpring", "PropertySpring", "Creates a Speckle structural spring property", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("c83d3807-3ee9-9eb6-d6d3-ae472e5fce01");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertySpring.ctor(System.String)","Objects.Structural.Properties.PropertySpring");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PropertySpring1SchemaComponent: CreateSchemaObjectBase {
-     
-    public PropertySpring1SchemaComponent(): base("PropertySpring (linear/elastic)", "PropertySpring (linear/elastic)", "Creates a Speckle structural spring property (linear/elastic spring)", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("03b67483-b251-b9f3-900a-e70c331314bb");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertySpring.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.PropertySpring");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class PropertySpring2SchemaComponent: CreateSchemaObjectBase {
-     
-    public PropertySpring2SchemaComponent(): base("PropertySpring (non-linear)", "PropertySpring (non-linear)", "Creates a Speckle structural spring property (non-linear spring)", "Speckle 2 Structural", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("761c5a65-bec6-b6fb-1df5-c49cc427631b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertySpring.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.PropertySpring");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RectangularSchemaComponent: CreateSchemaObjectBase {
-     
-    public RectangularSchemaComponent(): base("Rectangular", "Rectangular", "Creates a Speckle structural rectangular section profile", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("2f4dce06-42d9-fe1e-5096-24debfd2fd4b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Rectangular.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Rectangular");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RenderMaterialSchemaComponent: CreateSchemaObjectBase {
-     
-    public RenderMaterialSchemaComponent(): base("RenderMaterial", "RenderMaterial", "Creates a render material.", "Speckle 2 BIM", "Other") { }
-    
-    public override Guid ComponentGuid => new Guid("03a49484-4eba-6e08-5e96-b3b78ed13f70");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.RenderMaterial.ctor(System.Double,System.Double,System.Double,System.Nullable`1[System.Drawing.Color],System.Nullable`1[System.Drawing.Color])","Objects.Other.RenderMaterial");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RestraintSchemaComponent: CreateSchemaObjectBase {
-     
-    public RestraintSchemaComponent(): base("Restraint (by code)", "Restraint (by code)", "Creates a Speckle restraint object", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("4a117edf-50f0-9c11-6a80-e9692f15771b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Restraint.ctor(System.String)","Objects.Structural.Geometry.Restraint");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Restraint1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Restraint1SchemaComponent(): base("Restraint (by code and stiffness)", "Restraint (by code and stiffness)", "Creates a Speckle restraint object (to describe support conditions with an explicit stiffness)", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("a57df1f7-6fbd-4c84-a9d6-bd2d84f73811");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Restraint.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Geometry.Restraint");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Restraint2SchemaComponent: CreateSchemaObjectBase {
-     
-    public Restraint2SchemaComponent(): base("Restraint (by enum)", "Restraint (by enum)", "Creates a Speckle restraint object (for pinned condition or fixed condition)", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("f85b9d32-e383-56a2-e6fa-1da0d28febe9");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Restraint.ctor(Objects.Structural.Geometry.RestraintType)","Objects.Structural.Geometry.Restraint");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Result1DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Result1DSchemaComponent(): base("Result1D (load case)", "Result1D (load case)", "Creates a Speckle 1D element result object (for load case)", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("62b6e9c3-13b6-9dbd-b222-a0b6a978750e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result1D.ctor(Objects.Structural.Geometry.Element1D,Objects.Structural.Loading.LoadCase,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Result1D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Result1D1SchemaComponent(): base("Result1D (load combination)", "Result1D (load combination)", "Creates a Speckle 1D element result object (for load combination)", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("1151871b-42cc-e3f5-5e08-454f9733ef08");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result1D.ctor(Objects.Structural.Geometry.Element1D,Objects.Structural.Loading.LoadCombination,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Result2DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Result2DSchemaComponent(): base("Result2D (load case)", "Result2D (load case)", "Creates a Speckle 2D element result object (for load case)", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("4d551fc5-fc7b-b2b8-5bba-63e48aeee645");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result2D.ctor(Objects.Structural.Geometry.Element2D,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[System.Double],System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Result2D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Result2D1SchemaComponent(): base("Result2D (load combination)", "Result2D (load combination)", "Creates a Speckle 2D element result object (for load combination)", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("29194017-21da-96ee-56c4-273cc84ff951");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result2D.ctor(Objects.Structural.Geometry.Element2D,Objects.Structural.Loading.LoadCombination,System.Collections.Generic.List`1[System.Double],System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Result3DSchemaComponent: CreateSchemaObjectBase {
-     
-    public Result3DSchemaComponent(): base("Result3D (load case)", "Result3D (load case)", "Creates a Speckle 3D element result object (for load case)", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("3a15c6fa-36cd-1da9-e410-928a62b940a8");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result3D.ctor(Objects.Structural.Geometry.Element3D,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[System.Double],System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result3D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Result3D1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Result3D1SchemaComponent(): base("Result3D (load combination)", "Result3D (load combination)", "Creates a Speckle 3D element result object (for load combination)", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("1aa4dd1e-d845-7760-0e58-a3744255f0a1");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result3D.ctor(Objects.Structural.Geometry.Element3D,Objects.Structural.Loading.LoadCombination,System.Collections.Generic.List`1[System.Double],System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result3D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultGlobalSchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultGlobalSchemaComponent(): base("ResultGlobal (load case)", "ResultGlobal (load case)", "Creates a Speckle global result object (for load case)", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("6e742681-a159-d811-8d7c-4ac42682872f");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultGlobal.ctor(Objects.Structural.Loading.LoadCase,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.ResultGlobal");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultGlobal1SchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultGlobal1SchemaComponent(): base("ResultGlobal (load combination)", "ResultGlobal (load combination)", "Creates a Speckle global result object (for load combination)", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("cd0af8ae-e8d9-b1d9-fce1-63d137a8f69c");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultGlobal.ctor(Objects.Structural.Loading.LoadCombination,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.ResultGlobal");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultNodeSchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultNodeSchemaComponent(): base("ResultNode (load case)", "ResultNode (load case)", "Creates a Speckle structural nodal result object", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("5bf05a45-f397-00ae-0cf5-d89191042d21");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultNode.ctor(Objects.Structural.Loading.LoadCase,Objects.Structural.Geometry.Node,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.ResultNode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultNode1SchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultNode1SchemaComponent(): base("ResultNode (load combination)", "ResultNode (load combination)", "Creates a Speckle structural nodal result object", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("c219b902-4ffd-8d03-7de0-2264c8ad6030");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultNode.ctor(Objects.Structural.Loading.LoadCombination,Objects.Structural.Geometry.Node,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.ResultNode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultSet1DSchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultSet1DSchemaComponent(): base("ResultSet1D", "ResultSet1D", "Creates a Speckle 1D element result set object", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("7928905d-5fad-53c8-8d44-0eec0c5478ba");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSet1D.ctor(System.Collections.Generic.List`1[Objects.Structural.Results.Result1D])","Objects.Structural.Results.ResultSet1D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultSet2DSchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultSet2DSchemaComponent(): base("ResultSet2D", "ResultSet2D", "Creates a Speckle 2D element result set object", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("ff5bdc35-b72a-a0be-066f-5ad08fbb047d");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSet2D.ctor(System.Collections.Generic.List`1[Objects.Structural.Results.Result2D])","Objects.Structural.Results.ResultSet2D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultSet3DSchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultSet3DSchemaComponent(): base("ResultSet3D", "ResultSet3D", "Creates a Speckle 3D element result set object", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("7cde5263-7dd0-a1f7-535b-e9856769bc39");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSet3D.ctor(System.Collections.Generic.List`1[Objects.Structural.Results.Result3D])","Objects.Structural.Results.ResultSet3D");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultSetAllSchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultSetAllSchemaComponent(): base("ResultSetAll", "ResultSetAll", "Creates a Speckle result set object for 1d element, 2d element, 3d element global and nodal results", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("440aefda-79ff-55f5-4571-1a7ef57239e8");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSetAll.ctor(Objects.Structural.Results.ResultSet1D,Objects.Structural.Results.ResultSet2D,Objects.Structural.Results.ResultSet3D,Objects.Structural.Results.ResultGlobal,Objects.Structural.Results.ResultSetNode)","Objects.Structural.Results.ResultSetAll");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class ResultSetNodeSchemaComponent: CreateSchemaObjectBase {
-     
-    public ResultSetNodeSchemaComponent(): base("ResultSetNode", "ResultSetNode", "Creates a Speckle node result set object", "Speckle 2 Structural", "Results") { }
-    
-    public override Guid ComponentGuid => new Guid("07d3aa5f-55e8-f0c6-96da-d9599a8da233");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSetNode.ctor(System.Collections.Generic.List`1[Objects.Structural.Results.ResultNode])","Objects.Structural.Results.ResultSetNode");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitBeamSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitBeamSchemaComponent(): base("RevitBeam", "RevitBeam", "Creates a Revit beam by curve and base level.", "Speckle 2 Revit", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("6aba19f5-1b1c-8e0c-f063-2a7c91816b1c");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitBeam.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitBeam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitBraceSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitBraceSchemaComponent(): base("RevitBrace", "RevitBrace", "Creates a Revit brace by curve and base level.", "Speckle 2 Revit", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("a3a689dc-2ca5-d5be-a225-99a144768e7e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitBrace.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitBrace");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitCeilingSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitCeilingSchemaComponent(): base("RevitCeiling", "RevitCeiling", "Creates a Revit ceiling", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("93e6568e-0dc2-ebd2-64b0-e202eabe49cb");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitCeiling.ctor(Objects.ICurve,System.String,System.String,Objects.BuiltElements.Level,System.Double,Objects.Geometry.Line,System.Double,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Revit.RevitCeiling");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitColumnSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitColumnSchemaComponent(): base("RevitColumn Vertical", "RevitColumn Vertical", "Creates a vertical Revit Column by point and levels.", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("c243fe91-0103-bea1-34b7-3e8b39c8d0ec");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitColumn.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Double,System.Double,System.Boolean,System.Double,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitColumn");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitColumn1SchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitColumn1SchemaComponent(): base("RevitColumn Slanted (old)", "RevitColumn Slanted (old)", "Creates a slanted Revit Column by curve.", "Speckle 2 Revit", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("bd9936e6-c75f-c0de-feb0-b801eff0e0ea");
-    public override bool Obsolete => true;
-    public override GH_Exposure Exposure => GH_Exposure.hidden;
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitColumn.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitColumn");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitColumn2SchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitColumn2SchemaComponent(): base("RevitColumn Slanted", "RevitColumn Slanted", "Creates a slanted Revit Column by curve.", "Speckle 2 Revit", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("1600415c-b327-870c-7cd4-bb9c1b1a82fc");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitColumn.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitColumn");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitDuctSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitDuctSchemaComponent(): base("RevitDuct", "RevitDuct", "Creates a Revit duct", "Speckle 2 Revit", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("d7781536-e8a9-8aef-1b27-571584f8c4a3");
-    public override bool Obsolete => true;
-    public override GH_Exposure Exposure => GH_Exposure.hidden;
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitDuct.ctor(System.String,System.String,Objects.Geometry.Line,System.String,System.String,Objects.BuiltElements.Level,System.Double,System.Double,System.Double,System.Double,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitDuct");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitDuct1SchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitDuct1SchemaComponent(): base("RevitDuct", "RevitDuct", "Creates a Revit duct", "Speckle 2 Revit", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("7bb86598-9cd2-8d29-a1dc-7500c4b4ed4b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitDuct.ctor(System.String,System.String,Objects.ICurve,System.String,System.String,Objects.BuiltElements.Level,System.Double,System.Double,System.Double,System.Double,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitDuct");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitExtrusionRoofSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitExtrusionRoofSchemaComponent(): base("RevitExtrusionRoof", "RevitExtrusionRoof", "Creates a Revit roof by extruding a curve", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("707428ab-15b4-e7ec-a2cd-21154ff50c1b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitRoof.RevitExtrusionRoof.ctor(System.String,System.String,System.Double,System.Double,Objects.Geometry.Line,Objects.BuiltElements.Level,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitRoof.RevitExtrusionRoof");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitFaceWallSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitFaceWallSchemaComponent(): base("RevitWall by face", "RevitWall by face", "Creates a Revit wall from a surface.", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("fc3927a7-0877-8137-a34e-ecd19a6f688c");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitFaceWall.ctor(System.String,System.String,Objects.Geometry.Brep,Objects.BuiltElements.Level,Objects.BuiltElements.Revit.LocationLine,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitFaceWall");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitFlexDuctSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitFlexDuctSchemaComponent(): base("RevitFlexDuct", "RevitFlexDuct", "Creates a Revit flex duct", "Speckle 2 Revit", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("f350f9a2-06ca-6118-a4e6-88e721bb7f52");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitFlexDuct.ctor(System.String,System.String,Objects.ICurve,System.String,System.String,Objects.BuiltElements.Level,System.Double,System.Double,System.Double,Objects.Geometry.Vector,Objects.Geometry.Vector,System.Double,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitFlexDuct");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitFlexPipeSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitFlexPipeSchemaComponent(): base("RevitFlexPipe", "RevitFlexPipe", "Creates a Revit flex pipe", "Speckle 2 Revit", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("219bfacc-9c41-441a-210c-c2cfb877929b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitFlexPipe.ctor(System.String,System.String,Objects.ICurve,System.Double,Objects.BuiltElements.Level,Objects.Geometry.Vector,Objects.Geometry.Vector,System.String,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitFlexPipe");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitFloorSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitFloorSchemaComponent(): base("RevitFloor", "RevitFloor", "Creates a Revit floor by outline and level", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("e6f17d4f-6c28-0d0f-2370-7b9c09a14fff");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitFloor.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Boolean,System.Double,Objects.Geometry.Line,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitFloor");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitFootprintRoofSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitFootprintRoofSchemaComponent(): base("RevitFootprintRoof", "RevitFootprintRoof", "Creates a Revit roof by outline", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("b2f55d9f-7242-ee7e-c44a-24e34d5f6e3e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitRoof.RevitFootprintRoof.ctor(Objects.ICurve,System.String,System.String,Objects.BuiltElements.Level,Objects.BuiltElements.Revit.RevitLevel,System.Double,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitRoof.RevitFootprintRoof");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitLevelSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitLevelSchemaComponent(): base("RevitLevel", "RevitLevel", "Creates a new Revit level unless one with the same elevation already exists", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("5ef6e45c-00bd-f3b9-1cbf-6e9a902da7ab");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitLevel.ctor(System.String,System.Double,System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitLevel");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitLevel1SchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitLevel1SchemaComponent(): base("RevitLevel by name", "RevitLevel by name", "Gets an existing Revit level by name", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("e075a88e-7867-3726-3bb7-15b73b2d17e6");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitLevel.ctor(System.String)","Objects.BuiltElements.Revit.RevitLevel");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitMaterialSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitMaterialSchemaComponent(): base("RevitMaterial", "RevitMaterial", "Creates a Speckle material", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("c291d027-7a6a-8950-a2aa-77e134675750");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.Revit.RevitMaterial.ctor(System.String,System.String,System.String,System.Int32,System.Int32,System.Int32,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.Other.Revit.RevitMaterial");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitPipeSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitPipeSchemaComponent(): base("RevitPipe", "RevitPipe", "Creates a Revit pipe", "Speckle 2 Revit", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("19700cd2-6310-c8b3-7ad5-954033702e52");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitPipe.ctor(System.String,System.String,Objects.ICurve,System.Double,Objects.BuiltElements.Level,System.String,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitPipe");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitProfileWallSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitProfileWallSchemaComponent(): base("RevitWall by profile", "RevitWall by profile", "Creates a Revit wall from a profile.", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("b3962fc0-69b0-e766-22b4-b08404650c8a");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitProfileWall.ctor(System.String,System.String,Objects.Geometry.Polycurve,Objects.BuiltElements.Level,Objects.BuiltElements.Revit.LocationLine,System.Boolean,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitProfileWall");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitRailingSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitRailingSchemaComponent(): base("Railing", "Railing", "Creates a Revit railing by base curve.", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("a6c3be7a-9e6b-663b-2bc0-dd9fa2ee6552");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitRailing.ctor(System.String,Objects.Geometry.Polycurve,Objects.BuiltElements.Level,System.Boolean)","Objects.BuiltElements.Revit.RevitRailing");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitShaftSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitShaftSchemaComponent(): base("RevitShaft", "RevitShaft", "Creates a Revit shaft from a bottom and top level", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("00cdb2fd-ef75-107e-822c-3490cd359380");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitShaft.ctor(Objects.ICurve,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitShaft");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitTopographySchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitTopographySchemaComponent(): base("RevitTopography", "RevitTopography", "Creates a Revit topography", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("f0840908-039e-b6d4-98de-8ed003dfd357");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitTopography.ctor(Objects.Geometry.Mesh,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitTopography");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitWallSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitWallSchemaComponent(): base("RevitWall by curve and levels", "RevitWall by curve and levels", "Creates a Revit wall with a top and base level.", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("fa1aef22-ddd5-01f4-887e-145ce21da247");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWall.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Double,System.Double,System.Boolean,System.Boolean,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitWall");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitWall1SchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitWall1SchemaComponent(): base("RevitWall by curve and height", "RevitWall by curve and height", "Creates an unconnected Revit wall.", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("bd2a0bb1-14f7-cd0a-76c4-2429412a5128");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWall.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Double,System.Double,System.Double,System.Boolean,System.Boolean,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitWall");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitWallOpeningSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitWallOpeningSchemaComponent(): base("Revit Wall Opening (Deprecated)", "Revit Wall Opening (Deprecated)", "Creates a Speckle Wall opening for revit", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("a1bd278d-fab5-0034-7aba-807b66122022");
-    public override bool Obsolete => true;
-    public override GH_Exposure Exposure => GH_Exposure.hidden;
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWallOpening.ctor(Objects.ICurve,Objects.BuiltElements.Revit.RevitWall)","Objects.BuiltElements.Revit.RevitWallOpening");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitWallOpening1SchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitWallOpening1SchemaComponent(): base("Revit Wall Opening", "Revit Wall Opening", "Creates a Speckle Wall opening for revit", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("541bfed0-738d-e1bd-1130-de05ec4bbf9e");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWallOpening.ctor(Objects.Geometry.Polyline,Objects.BuiltElements.Revit.RevitWall)","Objects.BuiltElements.Revit.RevitWallOpening");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RevitWireSchemaComponent: CreateSchemaObjectBase {
-     
-    public RevitWireSchemaComponent(): base("RevitWire", "RevitWire", "Creates a Revit wire from points and level", "Speckle 2 Revit", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("4045436b-0804-f0e1-a9f2-6217f4d8a45b");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWire.ctor(System.Collections.Generic.List`1[System.Double],System.String,System.String,Objects.BuiltElements.Level,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitWire");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RibbedSlabSchemaComponent: CreateSchemaObjectBase {
-     
-    public RibbedSlabSchemaComponent(): base("RibbedSlab", "RibbedSlab", "Create an CSI Ribbed Slab", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("e5db5889-0924-136f-be6d-39c7de9a3649");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+RibbedSlab.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double,System.Int32)","Objects.Structural.CSI.Properties.CSIProperty2D+RibbedSlab");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RoofSchemaComponent: CreateSchemaObjectBase {
-     
-    public RoofSchemaComponent(): base("Roof", "Roof", "Creates a Speckle roof", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("c10c6dcd-e6a8-be88-32f3-45c935d0bae9");
-    public override bool Obsolete => true;
-    public override GH_Exposure Exposure => GH_Exposure.hidden;
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Roof.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Roof");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RoomSchemaComponent: CreateSchemaObjectBase {
-     
-    public RoomSchemaComponent(): base("Room", "Room", "Creates a Speckle room", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("c62087b7-2a9d-743d-336d-e8ea2ab72a29");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Room.ctor(System.String,System.String,Objects.BuiltElements.Level,Objects.Geometry.Point)","Objects.BuiltElements.Room");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Room1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Room1SchemaComponent(): base("RevitRoom", "RevitRoom", "Creates a Revit room with parameters", "Speckle 2 Revit", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("9be891e2-aaf6-1d4e-3d6b-bd7ba1a06563");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Room.ctor(System.String,System.String,Objects.BuiltElements.Level,Objects.Geometry.Point,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Room");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class RoomBoundaryLineSchemaComponent: CreateSchemaObjectBase {
-     
-    public RoomBoundaryLineSchemaComponent(): base("RoomBoundaryLine", "RoomBoundaryLine", "Creates a Revit room boundary line", "Speckle 2 Revit", "Curves") { }
-    
-    public override Guid ComponentGuid => new Guid("2edade8a-5139-09be-4273-551f3ac476e2");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Curve.RoomBoundaryLine.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.Curve.RoomBoundaryLine");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class SlabSchemaComponent: CreateSchemaObjectBase {
-     
-    public SlabSchemaComponent(): base("Slab", "Slab", "Create an CSI Slab", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("27930f28-6811-7f66-f432-07dd5585f6e0");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+Slab.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+Slab");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class SpaceSchemaComponent: CreateSchemaObjectBase {
-     
-    public SpaceSchemaComponent(): base("Space", "Space", "Creates a Speckle space", "Speckle 2 BIM", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("c6907933-2792-eb6d-7c64-fb54835e9b44");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Space.ctor(System.String,System.String,Objects.Geometry.Point,Objects.BuiltElements.Level)","Objects.BuiltElements.Space");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class Space1SchemaComponent: CreateSchemaObjectBase {
-     
-    public Space1SchemaComponent(): base("Space with top level and offset parameters", "Space with top level and offset parameters", "Creates a Speckle space with the specified top level and offsets", "Speckle 2 BIM", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("8f7b0323-3533-e7cd-ae43-0bdeb34f3570");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Space.ctor(System.String,System.String,Objects.Geometry.Point,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Double,System.Double)","Objects.BuiltElements.Space");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class SpaceSeparationLineSchemaComponent: CreateSchemaObjectBase {
-     
-    public SpaceSeparationLineSchemaComponent(): base("SpaceSeparationLine", "SpaceSeparationLine", "Creates a Revit space separation line", "Speckle 2 Revit", "Curves") { }
-    
-    public override Guid ComponentGuid => new Guid("0bba13ce-5758-8513-42fd-9e0b3702a654");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Curve.SpaceSeparationLine.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.Curve.SpaceSeparationLine");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class SteelSchemaComponent: CreateSchemaObjectBase {
-     
-    public SteelSchemaComponent(): base("Steel", "Steel", "Creates a Speckle structural material for steel (to be used in structural analysis models)", "Speckle 2 Structural", "Materials") { }
-    
-    public override Guid ComponentGuid => new Guid("6756df31-1e5c-0c80-2047-f4b6557c2e3f");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.Steel.ctor(System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Materials.Steel");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class StoreySchemaComponent: CreateSchemaObjectBase {
-     
-    public StoreySchemaComponent(): base("Storey", "Storey", "Creates a Speckle structural storey (to describe floor levels/storeys in the structural model)", "Speckle 2 Structural", "Geometry") { }
-    
-    public override Guid ComponentGuid => new Guid("a3985ed4-fff8-47c1-bb0e-d63699e263e9");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Storey.ctor(System.String,System.Double)","Objects.Structural.Geometry.Storey");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class StructuralMaterialSchemaComponent: CreateSchemaObjectBase {
-     
-    public StructuralMaterialSchemaComponent(): base("Structural Material", "Structural Material", "Creates a Speckle structural material", "Speckle 2 Structural", "Materials") { }
-    
-    public override Guid ComponentGuid => new Guid("3e877a75-b3fb-0111-2128-1432ab15c4cf");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.StructuralMaterial.ctor(System.String,Objects.Structural.MaterialType,System.String,System.String,System.String)","Objects.Structural.Materials.StructuralMaterial");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class StructuralMaterial1SchemaComponent: CreateSchemaObjectBase {
-     
-    public StructuralMaterial1SchemaComponent(): base("Structural Material (with properties)", "Structural Material (with properties)", "Creates a Speckle structural material with (isotropic) properties", "Speckle 2 Structural", "Materials") { }
-    
-    public override Guid ComponentGuid => new Guid("ef78155b-0786-9846-38cd-41ce70911972");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.StructuralMaterial.ctor(System.String,Objects.Structural.MaterialType,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Materials.StructuralMaterial");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class TeeSchemaComponent: CreateSchemaObjectBase {
-     
-    public TeeSchemaComponent(): base("Tee", "Tee", "Creates a Speckle structural Tee section profile", "Speckle 2 Structural", "Section Profile") { }
-    
-    public override Guid ComponentGuid => new Guid("7832cac3-92e9-9083-df97-0d4296b457c3");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Tee.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Tee");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class TeklaBeamSchemaComponent: CreateSchemaObjectBase {
-     
-    public TeklaBeamSchemaComponent(): base("TeklaBeam", "TeklaBeam", "Creates a Tekla Structures beam by curve.", "Speckle 2 Tekla", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("5a4187bc-05d8-2447-7238-cdbc4b2fae45");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.TeklaStructures.TeklaBeam.ctor(Objects.ICurve,Objects.Structural.Properties.Profiles.SectionProfile,Objects.Structural.Materials.StructuralMaterial)","Objects.BuiltElements.TeklaStructures.TeklaBeam");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class TeklaContourPlateSchemaComponent: CreateSchemaObjectBase {
-     
-    public TeklaContourPlateSchemaComponent(): base("ContourPlate", "ContourPlate", "Creates a TeklaStructures contour plate.", "Speckle 2 Tekla", "Structure") { }
-    
-    public override Guid ComponentGuid => new Guid("3b092935-3c2f-c084-eea5-077630507a49");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.TeklaStructures.TeklaContourPlate.ctor(Objects.Structural.Properties.Profiles.SectionProfile,Objects.Geometry.Polyline,System.String,System.String,System.String,Objects.Structural.Materials.StructuralMaterial,Objects.BuiltElements.TeklaStructures.TeklaPosition,Speckle.Core.Models.Base)","Objects.BuiltElements.TeklaStructures.TeklaContourPlate");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class TimberSchemaComponent: CreateSchemaObjectBase {
-     
-    public TimberSchemaComponent(): base("Timber", "Timber", "Creates a Speckle structural material for timber (to be used in structural analysis models)", "Speckle 2 Structural", "Materials") { }
-    
-    public override Guid ComponentGuid => new Guid("f11d278f-6a36-fd7c-409d-fb39f52c73f5");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.Timber.ctor(System.String,System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Materials.Timber");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class TopographySchemaComponent: CreateSchemaObjectBase {
-     
-    public TopographySchemaComponent(): base("Topography", "Topography", "Creates a Speckle topography", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("b9207a45-eebc-72d6-a411-f496443d8b7f");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Topography.ctor(Objects.Geometry.Mesh)","Objects.BuiltElements.Topography");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class WaffleSlabSchemaComponent: CreateSchemaObjectBase {
-     
-    public WaffleSlabSchemaComponent(): base("WaffleSlab", "WaffleSlab", "Create an CSI Waffle Slab", "Speckle 2 CSI", "Properties") { }
-    
-    public override Guid ComponentGuid => new Guid("b8956ee0-8372-db59-654a-c11c4af5e0f6");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+WaffleSlab.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+WaffleSlab");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class WallSchemaComponent: CreateSchemaObjectBase {
-     
-    public WallSchemaComponent(): base("Wall", "Wall", "Creates a Speckle wall", "Speckle 2 BIM", "Architecture") { }
-    
-    public override Guid ComponentGuid => new Guid("6878cc65-2628-d00d-e8c0-b130e828a6c7");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Wall.ctor(System.Double,Objects.ICurve,System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Wall");
-        base.AddedToDocument(document);
-    }
-}
-
-// This is generated code:
-public class WireSchemaComponent: CreateSchemaObjectBase {
-     
-    public WireSchemaComponent(): base("Wire", "Wire", "Creates a Speckle wire from curve segments and points", "Speckle 2 BIM", "MEP") { }
-    
-    public override Guid ComponentGuid => new Guid("c10c9c87-b93d-4e98-d2fb-942d182008dc");
-    
-    public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Wire.ctor(System.Collections.Generic.List`1[Objects.ICurve])","Objects.BuiltElements.Wire");
-        base.AddedToDocument(document);
-    }
-}
-
-
-}
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/packages.config b/ConnectorGrasshopper/ConnectorGrasshopper/packages.config
deleted file mode 100644
index 6fbcc85342..0000000000
--- a/ConnectorGrasshopper/ConnectorGrasshopper/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net472" />
-  <package id="Sentry" version="3.15.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Collections.Immutable" version="5.0.0" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.Reflection.Metadata" version="5.0.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="5.0.1" targetFramework="net472" />
-  <package id="System.Text.Json" version="5.0.2" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj b/ConnectorGrasshopper/ConnectorGrasshopper6/ConnectorGrasshopper6.csproj
similarity index 53%
rename from ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj
rename to ConnectorGrasshopper/ConnectorGrasshopper6/ConnectorGrasshopper6.csproj
index 99d32e2298..191ab7b034 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj
+++ b/ConnectorGrasshopper/ConnectorGrasshopper6/ConnectorGrasshopper6.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{109B3382-634B-408A-8A5C-4CD09CB92641}</ProjectGuid>
+    <ProjectGuid>{86920221-416E-4A66-A601-3418207E2401}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ConnectorGrasshopper</RootNamespace>
@@ -15,7 +15,24 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <TransformOnBuild>false</TransformOnBuild>
     <PlatformTarget>x64</PlatformTarget>
+    <Platforms>AnyCPU</Platforms>
+    <DefineConstants>TRACE;RHINO6</DefineConstants>
+    <Configurations>Debug;Release;Debug Mac;Release Mac</Configurations>
   </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>TRACE;RHINO6</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug Mac'">
+    <DefineConstants>TRACE;RHINO6;MAC</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>TRACE;RHINO6</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release Mac'">
+    <DefineConstants>TRACE;RHINO6;MAC</DefineConstants>
+  </PropertyGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Core\Core.csproj" />
     <ProjectReference Include="..\..\Core\Transports\DiskTransport\DiskTransport.csproj" />
@@ -38,11 +55,23 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MSBuild.AssemblyVersion" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="GrasshopperAsyncComponent" Version="1.2.3" />
+    <PackageReference Include="RhinoCommon" Version="6.28.20199.17141" IncludeAssets="compile;build" />
+    <PackageReference Include="Grasshopper" Version="6.28.20199.17141" IncludeAssets="compile;build" />
+  </ItemGroup>
+
   <Target Name="GenerateT4" BeforeTargets="BeforeRebuild">
     <Message Text="Restoring T4 tool..." Importance="high" />
     <Exec Command="dotnet tool restore" />
     <Message Text="Generating T4 templates..." Importance="high" />
-    <Exec Command="dotnet t4 -o $(ProjectDir)SchemaBuilder\SchemaBuilderGen.cs $(ProjectDir)SchemaBuilder\SchemaBuilderGen.tt -P=$(ProjectDir)" />
+    <Exec Command="dotnet t4 -o $(ProjectDir)..\ConnectorGrasshopperShared\SchemaBuilder\SchemaBuilderGen.cs $(ProjectDir)..\ConnectorGrasshopperShared\SchemaBuilder\SchemaBuilderGen.tt -P=$(ProjectDir)" />
   </Target>
+  
+  <Import Project="..\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems" Label="Shared" />
 
 </Project>
\ No newline at end of file
diff --git a/ConnectorRevit/ConnectorRevit2019/Properties/AssemblyInfo.cs b/ConnectorGrasshopper/ConnectorGrasshopper6/Properties/AssemblyInfo.cs
similarity index 70%
rename from ConnectorRevit/ConnectorRevit2019/Properties/AssemblyInfo.cs
rename to ConnectorGrasshopper/ConnectorGrasshopper6/Properties/AssemblyInfo.cs
index 4467277122..c4565e95ef 100644
--- a/ConnectorRevit/ConnectorRevit2019/Properties/AssemblyInfo.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopper6/Properties/AssemblyInfo.cs
@@ -1,37 +1,35 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ConnectorRevit")]
+[assembly: AssemblyTitle("ConnectorGrasshopper")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Speckle")]
-[assembly: AssemblyProduct("ConnectorRevit")]
-[assembly: AssemblyCopyright("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ConnectorGrasshopper")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("321044f7-b0b2-4b1c-af18-e71a19252be0")]
+[assembly: Guid("86920221-416E-4A66-A601-3418207E2401")]
 
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers
+// You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.0.0-beta")]
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper7/ConnectorGrasshopper7.csproj b/ConnectorGrasshopper/ConnectorGrasshopper7/ConnectorGrasshopper7.csproj
new file mode 100644
index 0000000000..ca5d1a6b99
--- /dev/null
+++ b/ConnectorGrasshopper/ConnectorGrasshopper7/ConnectorGrasshopper7.csproj
@@ -0,0 +1,82 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ProjectGuid>{109B3382-634B-408A-8A5C-4CD09CB92641}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ConnectorGrasshopper</RootNamespace>
+    <AssemblyName>SpeckleConnectorGrasshopper</AssemblyName>
+    <TargetFramework>net48</TargetFramework>
+    <LangVersion>8</LangVersion>
+    <StartAction>Program</StartAction>
+    <StartProgram>C:\Program Files\Rhino 7\System\Rhino.exe</StartProgram>
+    <StartArguments />
+    <RhinoMacLauncher>/Applications/Rhino 7.app</RhinoMacLauncher>
+    <TargetExt>.gha</TargetExt>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TransformOnBuild>false</TransformOnBuild>
+    <PlatformTarget>x64</PlatformTarget>
+    <Platforms>AnyCPU</Platforms>
+    <DefineConstants>TRACE;RHINO7</DefineConstants>
+    <Configurations>Debug;Release;Debug Mac;Release Mac</Configurations>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>TRACE;RHINO7</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug Mac'">
+    <DefineConstants>TRACE;RHINO7;MAC</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>TRACE;RHINO7</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release Mac'">
+    <DefineConstants>TRACE;RHINO7;MAC</DefineConstants>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Core\Core.csproj" />
+    <ProjectReference Include="..\..\Core\Transports\DiskTransport\DiskTransport.csproj" />
+    <ProjectReference Include="..\ConnectorGrasshopperUtils\ConnectorGrasshopperUtils.csproj" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <None Update="SchemaBuilder\SchemaBuilderGen.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>SchemaBuilderGen.cs</LastGenOutput>
+    </None>
+    <None Remove="InternalTestFiles\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="SchemaBuilder\SchemaBuilderGen.cs">
+      <DependentUpon>SchemaBuilderGen.tt</DependentUpon>
+    </Compile>
+    <Compile Remove="InternalTestFiles\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSBuild.AssemblyVersion" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="GrasshopperAsyncComponent" Version="1.2.3" />
+    <PackageReference Include="RhinoCommon" Version="7.4.21078.1001" IncludeAssets="compile;build" >
+       <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Grasshopper" Version="7.4.21078.1001" IncludeAssets="compile;build" >
+       <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Remove="InternalTestFiles\**" />
+  </ItemGroup>
+  
+  <Target Name="GenerateT4" BeforeTargets="BeforeRebuild">
+    <Message Text="Restoring T4 tool..." Importance="high" />
+    <Exec Command="dotnet tool restore" />
+    <Message Text="Generating T4 templates..." Importance="high" />
+    <Exec Command="dotnet t4 -o $(ProjectDir)..\ConnectorGrasshopperShared\SchemaBuilder\SchemaBuilderGen.cs $(ProjectDir)..\ConnectorGrasshopperShared\SchemaBuilder\SchemaBuilderGen.tt -P=$(ProjectDir)" />
+  </Target>
+  <Import Project="..\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems" Label="Shared" />
+
+</Project>
\ No newline at end of file
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/AllGeometryConversionTest.gh b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/AllGeometryConversionTest.gh
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/AllGeometryConversionTest.gh
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/AllGeometryConversionTest.gh
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/AsyncIntegrationTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/AsyncIntegrationTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/AsyncIntegrationTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/AsyncIntegrationTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/AsyncObjectManagementTests.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/AsyncObjectManagementTests.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/AsyncObjectManagementTests.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/AsyncObjectManagementTests.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/BrepSendReceiveTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/BrepSendReceiveTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/BrepSendReceiveTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/BrepSendReceiveTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/BrepTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/BrepTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/BrepTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/BrepTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ComplexBrep.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ComplexBrep.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ComplexBrep.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ComplexBrep.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/CreateSpeckleObjectTests-WithGeometry.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/CreateSpeckleObjectTests-WithGeometry.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/CreateSpeckleObjectTests-WithGeometry.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/CreateSpeckleObjectTests-WithGeometry.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ExpandObjectTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ExpandObjectTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ExpandObjectTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ExpandObjectTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ExpandObjectTestCables.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ExpandObjectTestCables.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ExpandObjectTestCables.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ExpandObjectTestCables.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ExtendObjectTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ExtendObjectTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ExtendObjectTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ExtendObjectTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/KeyValueTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/KeyValueTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/KeyValueTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/KeyValueTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/LocalSendReceiveTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/LocalSendReceiveTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/LocalSendReceiveTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/LocalSendReceiveTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ReceiveCrash-A.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ReceiveCrash-A.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ReceiveCrash-A.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ReceiveCrash-A.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ReceiveCrash-B.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ReceiveCrash-B.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/ReceiveCrash-B.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/ReceiveCrash-B.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/RecursiveConversionTests.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/RecursiveConversionTests.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/RecursiveConversionTests.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/RecursiveConversionTests.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/SenderReceiverConversionTests.gh b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/SenderReceiverConversionTests.gh
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/SenderReceiverConversionTests.gh
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/SenderReceiverConversionTests.gh
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/SerializationTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/SerializationTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/SerializationTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/SerializationTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/StreamsTest.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/StreamsTest.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/StreamsTest.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/StreamsTest.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/SurfaceTests.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/SurfaceTests.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/SurfaceTests.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/SurfaceTests.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/TaskCapableObjectManagement.ghx b/ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/TaskCapableObjectManagement.ghx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/InternalTestFiles/TaskCapableObjectManagement.ghx
rename to ConnectorGrasshopper/ConnectorGrasshopper7/InternalTestFiles/TaskCapableObjectManagement.ghx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Properties/AssemblyInfo.cs b/ConnectorGrasshopper/ConnectorGrasshopper7/Properties/AssemblyInfo.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Properties/AssemblyInfo.cs
rename to ConnectorGrasshopper/ConnectorGrasshopper7/Properties/AssemblyInfo.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Accounts/Accounts.AccountDetails.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Accounts/Accounts.AccountDetails.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Accounts/Accounts.AccountDetails.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Accounts/Accounts.AccountDetails.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Accounts/Accounts.ListAccounts.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Accounts/Accounts.ListAccounts.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Accounts/Accounts.ListAccounts.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Accounts/Accounts.ListAccounts.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/ComponentTracker.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/ComponentTracker.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/ComponentTracker.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/ComponentTracker.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/GH_SpeckleAsyncComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/GH_SpeckleAsyncComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/GH_SpeckleAsyncComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/GH_SpeckleAsyncComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/GH_SpeckleComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/GH_SpeckleComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/GH_SpeckleComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/GH_SpeckleComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/GH_SpeckleTaskCapableComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/GH_SpeckleTaskCapableComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/GH_SpeckleTaskCapableComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/GH_SpeckleTaskCapableComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/ISpeckleTrackingComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/ISpeckleTrackingComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/ISpeckleTrackingComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/ISpeckleTrackingComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitAsyncComponentBase.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitAsyncComponentBase.cs
similarity index 97%
rename from ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitAsyncComponentBase.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitAsyncComponentBase.cs
index c2f70a455b..0df85491bd 100755
--- a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitAsyncComponentBase.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitAsyncComponentBase.cs
@@ -114,7 +114,7 @@ public virtual void SetConverterFromKit(string kitName)
       Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
       SpeckleGHSettings.OnMeshSettingsChanged +=
         (sender, args) => Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
-      Converter.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+      Converter.SetContextDocument(Loader.GetCurrentDocument());
       Message = $"Using the {Kit.Name} Converter";
     }
 
@@ -134,7 +134,7 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager)
 
     protected override void BeforeSolveInstance()
     {
-      Converter?.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+      Converter?.SetContextDocument(Loader.GetCurrentDocument());
       base.BeforeSolveInstance();
     }
 
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitComponentBase.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitComponentBase.cs
similarity index 96%
rename from ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitComponentBase.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitComponentBase.cs
index 7c308dad24..4a4455f1b2 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitComponentBase.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitComponentBase.cs
@@ -59,7 +59,7 @@ public void SetConverterFromKit(string kitName)
         Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
         SpeckleGHSettings.OnMeshSettingsChanged +=
           (sender, args) => Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
-        Converter.SetContextDocument(RhinoDoc.ActiveDoc);
+        Converter.SetContextDocument(Loader.GetCurrentDocument());
         Message = $"Using the {Kit.Name} Converter";
         ExpireSolution(true);
       }
@@ -99,7 +99,7 @@ public override void AddedToDocument(GH_Document document)
         Kit = KitManager.GetKitsWithConvertersForApp(Extras.Utilities.GetVersionedAppName())
           .FirstOrDefault(kit => kit.Name == SpeckleGHSettings.SelectedKitName);
         Converter = Kit.LoadConverter(Extras.Utilities.GetVersionedAppName());
-        Converter.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+        Converter.SetContextDocument(Loader.GetCurrentDocument());
         Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
         SpeckleGHSettings.OnMeshSettingsChanged +=
           (sender, args) => Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitTaskCapableComponentBase.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitTaskCapableComponentBase.cs
similarity index 97%
rename from ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitTaskCapableComponentBase.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitTaskCapableComponentBase.cs
index 6c58e883e9..f0b17c0470 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/BaseComponents/SelectKitTaskCapableComponentBase.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/BaseComponents/SelectKitTaskCapableComponentBase.cs
@@ -120,7 +120,7 @@ public virtual void SetConverterFromKit(string kitName)
       Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
       SpeckleGHSettings.OnMeshSettingsChanged +=
         (sender, args) => Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
-      Converter.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+      Converter.SetContextDocument(Loader.GetCurrentDocument());
       Message = $"Using the {Kit.Name} Converter";
     }
 
@@ -148,7 +148,7 @@ protected override void BeforeSolveInstance()
       try
       {
 
-        Converter?.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+        Converter?.SetContextDocument(Loader.GetCurrentDocument());
       }
       catch (Exception e)
       {
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/ComponentCategories.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/ComponentCategories.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/ComponentCategories.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/ComponentCategories.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopperInfo.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/ConnectorGrasshopperInfo.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopperInfo.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/ConnectorGrasshopperInfo.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopperShared/ConnectorGrasshopperShared.projitems b/ConnectorGrasshopper/ConnectorGrasshopperShared/ConnectorGrasshopperShared.projitems
new file mode 100644
index 0000000000..1ae52d4fa4
--- /dev/null
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/ConnectorGrasshopperShared.projitems
@@ -0,0 +1,84 @@
+<?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>DBB541D7-49ED-41FC-B94D-D5AFEAD29075</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>ConnectorGrasshopperShared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Accounts\Accounts.AccountDetails.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Accounts\Accounts.ListAccounts.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseComponents\ComponentTracker.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseComponents\GH_SpeckleAsyncComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseComponents\GH_SpeckleComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseComponents\GH_SpeckleTaskCapableComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseComponents\ISpeckleTrackingComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseComponents\SelectKitAsyncComponentBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseComponents\SelectKitComponentBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseComponents\SelectKitTaskCapableComponentBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ComponentCategories.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ConnectorGrasshopperInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Conversion\DeserialiseTaskCapableComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Conversion\SerialiseTaskCapableComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Conversion\ToNativeTaskCapableComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Conversion\ToSpeckleTaskCapableComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\DebounceDispatcher.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\GenericAccessParam.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\GH_SpeckleGoo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\SendReceiveDataParam.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\Speckle.IGH_Goo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\SpeckleBaseParam.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\SpeckleStatefulParam.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\SpeckleStateTag.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\SpeckleStreamParam.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\TreeBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extras\Utilities.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Loader.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Objects\CreateSpeckleObjectByKeyValueTaskComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Objects\CreateSpeckleObjectTaskComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Objects\DeconstructSpeckleObjectTaskComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Objects\Deprecated\ExpandSpeckleObjectTaskComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Objects\ExtendSpeckleObjectByKeyValueTaskComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Objects\ExtendSpeckleObjectTaskComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Objects\GetObjectKeysComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Objects\GetObjectValueByKeyTaskComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Deprecated\Operations.ReceiveComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Deprecated\Operations.ReceiveComponentSync.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Deprecated\Operations.SendComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Deprecated\Operations.SendComponentSync.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Deprecated\Operations.UpgradeUtils.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Deprecated\Operations.VariableInputSendComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Operations.ReceiveLocalComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Operations.SendLocalComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Operations.SyncReceiveComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Operations.SyncSendComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Operations.VariableInputReceiveComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ops\Operations.VariableInputSendComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Properties\Resources.Designer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SchemaBuilder\CreateSchemaObject.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SchemaBuilder\CreateSchemaObjectBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SchemaBuilder\CreateSchemaObjectDialog.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SchemaBuilder\CSOViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SchemaBuilder\SchemaBuilderGen.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SpeckleGHSettings.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Streams\StreamCreateComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Streams\StreamDetailsComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Streams\StreamGetComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Streams\StreamListComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Streams\StreamUpdateComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Transports\SendReceiveTransport.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Transports\Transports.Disk.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Transports\Transports.Memory.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Transports\Transports.Sqlite.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UpgradeUtilities.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)SchemaBuilder\SchemaBuilderGen.tt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Properties\Resources.resx" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/ConnectorGrasshopper/ConnectorGrasshopperShared/ConnectorGrasshopperShared.shproj b/ConnectorGrasshopper/ConnectorGrasshopperShared/ConnectorGrasshopperShared.shproj
new file mode 100644
index 0000000000..ec5e8bcb0c
--- /dev/null
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/ConnectorGrasshopperShared.shproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup Label="Globals">
+        <ProjectGuid>{0F1FD0C3-875F-4689-9C4A-C56E9AB31102}</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="ConnectorGrasshopperShared.projitems" Label="Shared" />
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Conversion/DeserialiseTaskCapableComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/DeserialiseTaskCapableComponent.cs
similarity index 65%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Conversion/DeserialiseTaskCapableComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/DeserialiseTaskCapableComponent.cs
index 8fca789329..bce9dadc72 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Conversion/DeserialiseTaskCapableComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/DeserialiseTaskCapableComponent.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using ConnectorGrasshopper.Extras;
@@ -11,14 +12,31 @@ namespace ConnectorGrasshopper
 {
   public class DeserializeTaskCapableComponent: GH_SpeckleTaskCapableComponent<Base>
   {
-    public override Guid ComponentGuid => new Guid("0336F3D1-2FEE-4B66-980D-63DB624980C9");
+    internal static Guid internalGuid => new Guid("0336F3D1-2FEE-4B66-980D-63DB624980C9");
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
     private CancellationTokenSource source;
     protected override System.Drawing.Bitmap Icon => Properties.Resources.Deserialize;
 
-    public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
-
-    public DeserializeTaskCapableComponent(): base("Deserialize", "Deserialize", "Deserializes a JSON string to a Speckle Base object.", ComponentCategories.SECONDARY_RIBBON, ComponentCategories.CONVERSION)
-    {}    
+    static DeserializeTaskCapableComponent()
+    {
+      SpeckleGHSettings.SettingsChanged += (_, args) =>
+      {
+        if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+        var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+        if (proxy == null) return;
+        proxy.Exposure = internalExposure;
+      };
+    }
+    public DeserializeTaskCapableComponent() : base("Deserialize", "Deserialize",
+      "Deserializes a JSON string to a Speckle Base object.", ComponentCategories.SECONDARY_RIBBON,
+      ComponentCategories.CONVERSION)
+    {
+    }    
     protected override void RegisterInputParams(GH_InputParamManager pManager)
     {
       pManager.AddTextParameter("Json", "J", "Serialized base objects in JSON format.", GH_ParamAccess.item);
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Conversion/SerialiseTaskCapableComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/SerialiseTaskCapableComponent.cs
similarity index 76%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Conversion/SerialiseTaskCapableComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/SerialiseTaskCapableComponent.cs
index b4beafd274..17fe97db10 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Conversion/SerialiseTaskCapableComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/SerialiseTaskCapableComponent.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using ConnectorGrasshopper.Extras;
@@ -13,10 +14,24 @@ namespace ConnectorGrasshopper.Conversion
   public class SerializeTaskCapableComponent : GH_SpeckleTaskCapableComponent<string>
   {
     private CancellationTokenSource source;
-    public override Guid ComponentGuid => new Guid("6F6A5347-8DE1-44FA-8D26-C73FD21650A9");
-    public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
+    internal static Guid internalGuid => new Guid("6F6A5347-8DE1-44FA-8D26-C73FD21650A9");
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
     protected override System.Drawing.Bitmap Icon => Properties.Resources.Serialize;
 
+    static SerializeTaskCapableComponent()
+    {
+      SpeckleGHSettings.SettingsChanged += (_, args) =>
+      {
+        if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+        var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+        if (proxy == null) return;
+        proxy.Exposure = internalExposure;
+      };
+    }
     public SerializeTaskCapableComponent() : base(
       "Serialize",
       "SRL",
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Conversion/ToNativeTaskCapableComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/ToNativeTaskCapableComponent.cs
similarity index 81%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Conversion/ToNativeTaskCapableComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/ToNativeTaskCapableComponent.cs
index 2811f3df18..145df4bfa4 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Conversion/ToNativeTaskCapableComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/ToNativeTaskCapableComponent.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using ConnectorGrasshopper.Extras;
@@ -15,6 +16,18 @@ namespace ConnectorGrasshopper.Conversion
 {
   public class ToNativeTaskCapableComponent : SelectKitTaskCapableComponentBase<IGH_Goo>
   {
+    static ToNativeTaskCapableComponent()
+    {
+      SpeckleGHSettings.SettingsChanged += (_, args) =>
+      {
+        if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+        var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+        if (proxy == null) return;
+        proxy.Exposure = SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
+      };
+    }
+    
     public ToNativeTaskCapableComponent() : base(
       "To Native", 
       "To Native",
@@ -22,13 +35,16 @@ public ToNativeTaskCapableComponent() : base(
       ComponentCategories.SECONDARY_RIBBON,
       ComponentCategories.CONVERSION)
     {
+
     }
 
     public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
 
     protected override Bitmap Icon => Properties.Resources.ToNative;
+    
+    internal static Guid internalGuid => new Guid("7F4BDA01-F9C8-42ED-ABC1-DA0443283219");
 
-    public override Guid ComponentGuid => new Guid("7F4BDA01-F9C8-42ED-ABC1-DA0443283219");
+    public override Guid ComponentGuid => internalGuid;
 
     public override bool CanDisableConversion => false;
 
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Conversion/ToSpeckleTaskCapableComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/ToSpeckleTaskCapableComponent.cs
similarity index 81%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Conversion/ToSpeckleTaskCapableComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/ToSpeckleTaskCapableComponent.cs
index c359ee521e..e9b2dae39e 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Conversion/ToSpeckleTaskCapableComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Conversion/ToSpeckleTaskCapableComponent.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using ConnectorGrasshopper.Extras;
@@ -14,6 +15,17 @@ namespace ConnectorGrasshopper.Conversion
 {
   public class ToSpeckleTaskCapableComponent : SelectKitTaskCapableComponentBase<IGH_Goo>
   {
+    static ToSpeckleTaskCapableComponent()
+    {
+      SpeckleGHSettings.SettingsChanged += (_, args) =>
+      {
+        if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+        var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+        if (proxy == null) return;
+        proxy.Exposure = internalExposure;
+      };
+    }
     public ToSpeckleTaskCapableComponent() : base(
       "To Speckle",
       "To Speckle",
@@ -25,12 +37,14 @@ public ToSpeckleTaskCapableComponent() : base(
 
     private CancellationTokenSource source;
 
-    public override Guid ComponentGuid => new Guid("FB88150A-1885-4A77-92EA-9B1378310FDD");
+    internal static Guid internalGuid => new Guid("FB88150A-1885-4A77-92EA-9B1378310FDD");
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
+    public override Guid ComponentGuid => internalGuid;
     protected override Bitmap Icon => Properties.Resources.ToNative;
 
     public override bool CanDisableConversion => false;
 
-    public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
+    public override GH_Exposure Exposure => internalExposure;
 
     protected override void RegisterInputParams(GH_InputParamManager pManager)
     {
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/DebounceDispatcher.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/DebounceDispatcher.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/DebounceDispatcher.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/DebounceDispatcher.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/GH_SpeckleGoo.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/GH_SpeckleGoo.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/GH_SpeckleGoo.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/GH_SpeckleGoo.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/GenericAccessParam.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/GenericAccessParam.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/GenericAccessParam.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/GenericAccessParam.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/SendReceiveDataParam.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SendReceiveDataParam.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/SendReceiveDataParam.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SendReceiveDataParam.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/Speckle.IGH_Goo.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/Speckle.IGH_Goo.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/Speckle.IGH_Goo.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/Speckle.IGH_Goo.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleBaseParam.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleBaseParam.cs
similarity index 89%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleBaseParam.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleBaseParam.cs
index e795324eb9..e7515abaab 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleBaseParam.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleBaseParam.cs
@@ -8,14 +8,14 @@ public class SpeckleBaseParam: GH_Param<GH_SpeckleBase>
     {
         public override Guid ComponentGuid => new Guid("55F13720-45C1-4B43-892A-25AE4D95EFF2");
         protected override Bitmap Icon => Properties.Resources.BaseParam;
-        public override GH_Exposure Exposure => GH_Exposure.hidden;
+        public override GH_Exposure Exposure => GH_Exposure.tertiary;
 
         public bool UseSchemaTag;
         public bool IsSchemaBuilderOutput;
 
         public SpeckleBaseParam(string name, string nickname, string description, GH_ParamAccess access,
           bool isSchemaBuilderOutput = false) :
-          this(name, nickname, description, ComponentCategories.PRIMARY_RIBBON, "Params", access)
+          this(name, nickname, description, "Params", "Primitive", access)
         {
           IsSchemaBuilderOutput = isSchemaBuilderOutput;
         }
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleStateTag.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleStateTag.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleStateTag.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleStateTag.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleStatefulParam.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleStatefulParam.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleStatefulParam.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleStatefulParam.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleStreamParam.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleStreamParam.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/SpeckleStreamParam.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/SpeckleStreamParam.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/TreeBuilder.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/TreeBuilder.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/TreeBuilder.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/TreeBuilder.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/Utilities.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/Utilities.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Extras/Utilities.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/Utilities.cs
index e382aef106..c16c405228 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Extras/Utilities.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Extras/Utilities.cs
@@ -42,7 +42,7 @@ public static ISpeckleConverter GetDefaultConverter()
         var defKit = KitManager.GetKitsWithConvertersForApp(Extras.Utilities.GetVersionedAppName()).FirstOrDefault(kit => kit != null && kit.Name == n);
         var converter = defKit.LoadConverter(Extras.Utilities.GetVersionedAppName());
         converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
-        converter.SetContextDocument(RhinoDoc.ActiveDoc);
+        converter.SetContextDocument(Loader.GetCurrentDocument());
         return converter;
       }
       catch
@@ -429,7 +429,7 @@ public static object TryConvertItemToSpeckle(object value, ISpeckleConverter con
       if (converter != null && converter.CanConvertToSpeckle(value))
       {
         var result = converter.ConvertToSpeckle(value);
-        result.applicationId = refId;
+        if(result != null) result.applicationId = refId;
         return result;
       }
 
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Loader.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Loader.cs
old mode 100755
new mode 100644
similarity index 54%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Loader.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Loader.cs
index 995498804c..f10516f9fa
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Loader.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Loader.cs
@@ -1,14 +1,22 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using System.Timers;
 using System.Windows.Forms;
+using ConnectorGrasshopper.Extras;
+using Grasshopper;
+using Grasshopper.GUI.Canvas;
 using Grasshopper.Kernel;
 using Rhino;
+using Speckle.Core.Api;
 using Speckle.Core.Kits;
 using Speckle.Core.Logging;
+using Speckle.Core.Models.Extensions;
 
 namespace ConnectorGrasshopper
 {
@@ -25,8 +33,7 @@ public class Loader : GH_AssemblyPriority
     public ISpeckleKit selectedKit;
     private ToolStripMenuItem speckleMenu;
     private IEnumerable<ToolStripItem> kitMenuItems;
-
-
+    
     public override GH_LoadingInstruction PriorityLoad()
     {
       var version = HostApplications.Grasshopper.GetVersion(HostAppVersion.v6);
@@ -47,7 +54,17 @@ public override GH_LoadingInstruction PriorityLoad()
         Log.CaptureException(e);
       }
 
-      Grasshopper.Instances.DocumentServer.DocumentAdded += CanvasCreatedEvent;
+      Grasshopper.Instances.CanvasCreated += OnCanvasCreated;
+#if RHINO7
+      if(Grasshopper.Instances.RunningHeadless)
+      {
+        // If GH is running headless, we listen for document added/removed events.
+        Grasshopper.Instances.DocumentServer.DocumentAdded += OnDocumentAdded;
+        Grasshopper.Instances.DocumentServer.DocumentRemoved += OnDocumentRemoved;
+      }
+#endif
+
+
       Grasshopper.Instances.ComponentServer.AddCategoryIcon(ComponentCategories.PRIMARY_RIBBON,
         Properties.Resources.speckle_logo);
       Grasshopper.Instances.ComponentServer.AddCategorySymbolName(ComponentCategories.PRIMARY_RIBBON, 'S');
@@ -57,45 +74,75 @@ public override GH_LoadingInstruction PriorityLoad()
       return GH_LoadingInstruction.Proceed;
     }
 
-    private static DialogResult ShowLoadErrorMessageBox()
+    private void OnDocumentAdded(GH_DocumentServer sender, GH_Document doc)
     {
-      return MessageBox.Show(
-        "There was a problem setting up Speckle\n" +
-        "This can be caused by \n\n" +
-        "- A corrupted install\n" +
-        "- Another Grasshopper plugin using an older version of Speckle\n" +
-        "- Having an older version of the Rhino connector installed\n" +
-        "Try reinstalling both Rhino and Grasshopper connectors.\n\n" +
-        "If the problem persists, please reach out to our Community Forum (https://speckle.community)",
-        "Speckle Error",
-        MessageBoxButtons.OK);
+      // Add events for solution start and end
+      doc.SolutionStart += DocumentOnSolutionStart;
+      doc.SolutionEnd += DocumentOnSolutionEnd;
+    }
+
+    private void OnDocumentRemoved(GH_DocumentServer sender, GH_Document doc)
+    {
+      // Remove events for solution start and end
+      doc.SolutionStart -= DocumentOnSolutionStart;
+      doc.SolutionEnd -= DocumentOnSolutionEnd;
+    }
+
+    private void DocumentOnSolutionStart(object sender, GH_SolutionEventArgs e)
+    {
+      SetupHeadlessDoc();
+    }
+
+    private void DocumentOnSolutionEnd(object sender, GH_SolutionEventArgs e)
+    {
+      DisposeHeadlessDoc();
+    }
+
+    private void OnCanvasCreated(GH_Canvas canvas)
+    {
+      Grasshopper.Instances.DocumentEditor.Load += OnDocumentEditorLoad;
+
+      if (canvas == null) return;
+
+      canvas.KeyDown += (s, e) =>
+      {
+        if (e.KeyCode == Keys.Tab && !KeyWatcher.TabPressed)
+          KeyWatcher.TabPressed = true;
+      };
+
+      canvas.KeyUp += (s, e) =>
+      {
+        if (KeyWatcher.TabPressed && e.KeyCode == Keys.Tab)
+          KeyWatcher.TabPressed = false;
+      };
     }
 
-    private void CanvasCreatedEvent(GH_DocumentServer server, GH_Document doc)
+    private void OnDocumentEditorLoad(object sender, EventArgs e)
     {
       try
       {
-        AddSpeckleMenu(null, null);
+        var mainMenu = Grasshopper.Instances.DocumentEditor.MainMenuStrip;
+        AddSpeckleMenu(mainMenu);
       }
-      catch (Exception e)
+      catch (Exception ex)
       {
         ShowLoadErrorMessageBox();
       }
+    }
 
-      if (Grasshopper.Instances.ActiveCanvas != null)
-      {
-        Grasshopper.Instances.ActiveCanvas.KeyDown += (s, e) =>
-        {
-          if (e.KeyCode == Keys.Tab && !KeyWatcher.TabPressed)
-            KeyWatcher.TabPressed = true;
-        };
 
-        Grasshopper.Instances.ActiveCanvas.KeyUp += (s, e) =>
-        {
-          if (KeyWatcher.TabPressed && e.KeyCode == Keys.Tab)
-            KeyWatcher.TabPressed = false;
-        };
-      }
+    private static DialogResult ShowLoadErrorMessageBox()
+    {
+      return MessageBox.Show(
+        "There was a problem setting up Speckle\n" +
+        "This can be caused by \n\n" +
+        "- A corrupted install\n" +
+        "- Another Grasshopper plugin using an older version of Speckle\n" +
+        "- Having an older version of the Rhino connector installed\n" +
+        "Try reinstalling both Rhino and Grasshopper connectors.\n\n" +
+        "If the problem persists, please reach out to our Community Forum (https://speckle.community)",
+        "Speckle Error",
+        MessageBoxButtons.OK);
     }
 
     private void HandleKitSelectedEvent(object sender, EventArgs args)
@@ -117,44 +164,24 @@ private void HandleKitSelectedEvent(object sender, EventArgs args)
       }
     }
 
-    private void AddSpeckleMenu(object sender, ElapsedEventArgs e)
+    private void AddSpeckleMenu(MenuStrip mainMenu)
     {
-      if (Grasshopper.Instances.DocumentEditor == null || MenuHasBeenAdded) return;
-      var mainMenu = Grasshopper.Instances.DocumentEditor.MainMenuStrip;
+      if (MenuHasBeenAdded) return;
+      // Double check that the menu does not exist.
+      
       var menuName = "Speckle 2";
       if (mainMenu.Items.ContainsKey(menuName))
         mainMenu.Items.RemoveByKey(menuName);
 
       speckleMenu = new ToolStripMenuItem(menuName);
 
-      var kitHeader = speckleMenu.DropDown.Items.Add("Select the converter you want to use.");
-      kitHeader.Enabled = false;
-
-      try
-      {
-        loadedKits = KitManager.GetKitsWithConvertersForApp(Extras.Utilities.GetVersionedAppName());
-
-        var kitItems = new List<ToolStripItem>();
-        loadedKits.ToList().ForEach(kit =>
-        {
-          var item = speckleMenu.DropDown.Items.Add("  " + kit.Name);
-
-          item.Click += HandleKitSelectedEvent;
-          kitItems.Add(item);
-        });
-        kitMenuItems = kitItems;
-      }
-      catch (Exception exception)
-      {
-        Log.CaptureException(exception);
-        var errItem = speckleMenu.DropDown.Items.Add("An error occurred while fetching Kits");
-        errItem.Enabled = false;
-      }
-
+      CreateKitSelectionMenu(speckleMenu);
       speckleMenu.DropDown.Items.Add(new ToolStripSeparator());
       CreateSchemaConversionMenu();
       speckleMenu.DropDown.Items.Add(new ToolStripSeparator());
       CreateMeshingSettingsMenu();
+      // speckleMenu.DropDown.Items.Add(new ToolStripSeparator());
+      // CreateHeadlessTemplateMenu();
       speckleMenu.DropDown.Items.Add(new ToolStripSeparator());
       CreateTabsMenu();
       speckleMenu.DropDown.Items.Add(new ToolStripSeparator());
@@ -173,42 +200,129 @@ private void AddSpeckleMenu(object sender, ElapsedEventArgs e)
 
       // Manager button
       speckleMenu.DropDown.Items.Add("Open Speckle Manager", Properties.Resources.speckle_logo,
-        (o, args) => Process.Start("speckle://"));
-
-      try
-      {
-        Grasshopper.Instances.DocumentEditor.Invoke(new Action(() =>
+        (o, args) =>
         {
-          if (!MenuHasBeenAdded)
+          try
+          {
+            string path = "";
+
+            Speckle.Core.Logging.Analytics.TrackEvent(Speckle.Core.Logging.Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Launch Manager" } });
+
+#if MAC
+            path = @"/Applications/Manager for Speckle.app";
+
+#else     
+            path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Speckle", "Manager", "Manager.exe");
+#endif  
+
+            if (File.Exists(path) || Directory.Exists(path))
+              Process.Start(path);
+            else
+            {
+              Process.Start(new ProcessStartInfo($"https://speckle.systems/download") { UseShellExecute = true });
+            }
+          }
+          catch (Exception ex)
           {
-            mainMenu.Items.Add(speckleMenu);
-            // Select the first kit by default.
-            if (speckleMenu.DropDown.Items.Count > 0)
-              HandleKitSelectedEvent(kitMenuItems.FirstOrDefault(k => k.Text.Trim() == "Objects"), null);
+            Log.CaptureException(ex, Sentry.SentryLevel.Error);
           }
-        }));
-      }
-      catch (Exception err)
-      {
-        Log.CaptureException(err);
-        var errItem = speckleMenu.DropDown.Items.Add("An error occurred while fetching Kits", null);
-        errItem.Enabled = false;
-      }
+        });
+
+
+      if (!MenuHasBeenAdded)
+        mainMenu.Items.Add(speckleMenu);
 
       MenuHasBeenAdded = true;
     }
 
+    private DebounceDispatcher headlessTemplateNameDebounceDispatcher = new DebounceDispatcher();
+
+    private void CreateHeadlessTemplateMenu()
+    {
+      var main = speckleMenu.DropDown.Items.Add("Rhino.Compute") as ToolStripMenuItem;
+      var head = main.DropDown.Items.Add("Default 3dm filename");
+      head.Enabled = false;
+      head.ToolTipText =
+        @"The file name of the default file to be used when running on Rhino.Compute. They should be placed in `%appdata%/Speckle/Templates/. If no file is found with that name, an empty file will be opened";
+      var textbox = new ToolStripTextBox("Default file name");
+      main.DropDown.Items.Add(textbox);
+      textbox.Text = SpeckleGHSettings.HeadlessTemplateFilename;
+      textbox.AutoSize = false;
+      textbox.Width = Global_Proc.UiAdjust(200);
+      textbox.TextChanged += (sender, text) =>
+        headlessTemplateNameDebounceDispatcher.Debounce(400, o => SpeckleGHSettings.HeadlessTemplateFilename = textbox.Text);
+      main.DropDown.Items.Add(new ToolStripSeparator());
+      main.DropDown.Items.Add("Open Templates folder", null, (sender, args) =>
+      {
+        var path = Path.Combine(Helpers.InstallSpeckleFolderPath, "Templates");
+        
+        if (!Directory.Exists(path))
+          Directory.CreateDirectory(path);
+#if MAC
+          Process.Start("file://" + path);
+#else
+          Process.Start("explorer.exe", "/select, " + path );
+#endif
+      });
+    }
+
+    private void CreateKitSelectionMenu(ToolStripMenuItem menu)
+    {
+      var header = new ToolStripMenuItem("Select the converter you want to use.") { Enabled = false };
+      var loading = new ToolStripMenuItem("   Loading Kits...") { Enabled = false };
+
+      menu.DropDown.Items.Add(header);
+      menu.DropDown.Items.Add(loading);
+
+      Task.Run(() =>
+      {
+        loadedKits = KitManager.GetKitsWithConvertersForApp(Extras.Utilities.GetVersionedAppName());
+
+        var kitItems = new List<ToolStripItem>();
+
+        loadedKits.ToList().ForEach(kit =>
+        {
+          var item = new ToolStripMenuItem("  " + kit.Name);
+          item.Click += HandleKitSelectedEvent;
+          kitItems.Add(item);
+        });
+        kitMenuItems = kitItems;
+      }).ContinueWith(task =>
+      {
+        if (task.Exception != null)
+        {
+          Log.CaptureException(task.Exception);
+          var errItem = new ToolStripMenuItem("An error occurred while fetching Kits");
+          errItem.DropDown.Items.Add(task.Exception.ToFormattedString());
+
+          RhinoApp.InvokeOnUiThread((Action)delegate
+          {
+            menu.DropDown.Items.Remove(loading);
+            menu.DropDown.Items.Insert(1, errItem);
+            Grasshopper.Instances.DocumentEditor.Refresh();
+          });
+          return;
+        }
+        RhinoApp.InvokeOnUiThread((Action)delegate
+        {
+          var current = 1;
+          menu.DropDown.Items.Remove(loading);
+          foreach (var item in kitMenuItems)
+            menu.DropDown.Items.Insert(current++, item);
+          HandleKitSelectedEvent(kitMenuItems.FirstOrDefault(k => k.Text.Trim() == "Objects"), null);
+          Grasshopper.Instances.DocumentEditor.Refresh();
+        });
+      });
+    }
+
     private void CreateTabsMenu()
     {
       var tabsMenu = speckleMenu.DropDown.Items.Add("Show/Hide Components") as ToolStripMenuItem;
-      var warn = tabsMenu.DropDown.Items.Add("Changes require restarting Rhino to take effect.");
-      warn.Enabled = false;
       new List<string>
       {
         "BIM",
         "Revit",
         "Structural",
-        "ETABS",
         "GSA",
         "Tekla",
         "CSI"
@@ -309,7 +423,53 @@ public static void KeepOpenOnDropdownCheck(ToolStripMenuItem ctl)
         item.MouseEnter += (o, e) => ctl.DropDown.AutoClose = false;
         item.MouseLeave += (o, e) => ctl.DropDown.AutoClose = true;
       }
+    }
+
+    private static RhinoDoc _headlessDoc;
+
+    public static void DisposeHeadlessDoc()
+    {
+#if RHINO7
+      _headlessDoc?.Dispose();
+#endif
+      _headlessDoc = null;
+    }
+
+    public static void SetupHeadlessDoc()
+    {
 
+#if RHINO7
+        // var templatePath = Path.Combine(Helpers.UserApplicationDataPath, "Speckle", "Templates",
+        //   SpeckleGHSettings.HeadlessTemplateFilename);
+        // Console.WriteLine($"Setting up doc. Looking for '{templatePath}'");
+        // _headlessDoc = File.Exists(templatePath)
+        //   ? RhinoDoc.CreateHeadless(templatePath)
+        //   : RhinoDoc.CreateHeadless(null);
+        
+        _headlessDoc = RhinoDoc.CreateHeadless(null);
+        Console.WriteLine(
+          $"Headless run with doc '{_headlessDoc.Name ?? "Untitled"}'\n    with template: '{_headlessDoc.TemplateFileUsed ?? "No template"}'\n    with units: {_headlessDoc.ModelUnitSystem}");
+#endif
+    }
+
+    /// <summary>
+    /// Get the current document for this Grasshopper instance.
+    /// This will correspond to the `ActiveDoc` on normal Rhino usage, while in headless mode it will try to load
+    /// </summary>
+    /// <returns></returns>
+    public static RhinoDoc GetCurrentDocument()
+    {
+#if RHINO7
+        if(Instances.RunningHeadless)
+        {
+          Console.WriteLine(
+            $"Fetching headless doc '{_headlessDoc.Name ?? "Untitled"}'\n    with template: '{_headlessDoc.TemplateFileUsed ?? "No template"}'");
+          Console.WriteLine("    Model units:" + _headlessDoc.ModelUnitSystem);
+        }
+        return Grasshopper.Instances.RunningHeadless ? _headlessDoc : RhinoDoc.ActiveDoc;
+#else
+        return RhinoDoc.ActiveDoc;
+#endif
     }
   }
 }
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/CreateSpeckleObjectByKeyValueTaskComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/CreateSpeckleObjectByKeyValueTaskComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Objects/CreateSpeckleObjectByKeyValueTaskComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/CreateSpeckleObjectByKeyValueTaskComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/CreateSpeckleObjectTaskComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/CreateSpeckleObjectTaskComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Objects/CreateSpeckleObjectTaskComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/CreateSpeckleObjectTaskComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/DeconstructSpeckleObjectTaskComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/DeconstructSpeckleObjectTaskComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Objects/DeconstructSpeckleObjectTaskComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/DeconstructSpeckleObjectTaskComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/Deprecated/ExpandSpeckleObjectTaskComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/Deprecated/ExpandSpeckleObjectTaskComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Objects/Deprecated/ExpandSpeckleObjectTaskComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/Deprecated/ExpandSpeckleObjectTaskComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/ExtendSpeckleObjectByKeyValueTaskComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/ExtendSpeckleObjectByKeyValueTaskComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Objects/ExtendSpeckleObjectByKeyValueTaskComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/ExtendSpeckleObjectByKeyValueTaskComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/ExtendSpeckleObjectTaskComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/ExtendSpeckleObjectTaskComponent.cs
similarity index 98%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Objects/ExtendSpeckleObjectTaskComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/ExtendSpeckleObjectTaskComponent.cs
index ace144a412..26629ba9b5 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/ExtendSpeckleObjectTaskComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/ExtendSpeckleObjectTaskComponent.cs
@@ -52,7 +52,10 @@ protected override void SolveInstance(IGH_DataAccess DA)
         } else if(inputObj is IGH_Goo goo)
         {
           var value = goo.GetType().GetProperty("Value")?.GetValue(goo);
-          if(Converter.CanConvertToSpeckle(value))
+          if (value is Base baseObj) {
+            @base = baseObj;
+          }
+          else if(Converter.CanConvertToSpeckle(value))
           {
             @base = Converter.ConvertToSpeckle(value);
             AddRuntimeMessage(GH_RuntimeMessageLevel.Remark, "Input object was not a Speckle object, but has been converted to one.");
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/GetObjectKeysComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/GetObjectKeysComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Objects/GetObjectKeysComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/GetObjectKeysComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Objects/GetObjectValueByKeyTaskComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/GetObjectValueByKeyTaskComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Objects/GetObjectValueByKeyTaskComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/GetObjectValueByKeyTaskComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.ReceiveComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.ReceiveComponent.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.ReceiveComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.ReceiveComponent.cs
index 40e7b10783..6575075243 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.ReceiveComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.ReceiveComponent.cs
@@ -669,7 +669,7 @@ public override void SetData(IGH_DataAccess DA)
       //the active document may have changed
       var converter = parent.Converter;
 
-      converter?.SetContextDocument(RhinoDoc.ActiveDoc);
+      converter?.SetContextDocument(Loader.GetCurrentDocument());
 
       var tree = Utilities.ConvertToTree(converter, ReceivedObject, Parent.AddRuntimeMessage);
       var receiveComponent = (ReceiveComponent)this.Parent;
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.ReceiveComponentSync.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.ReceiveComponentSync.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.ReceiveComponentSync.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.ReceiveComponentSync.cs
index f95b468e21..ce129de65e 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.ReceiveComponentSync.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.ReceiveComponentSync.cs
@@ -212,7 +212,7 @@ private void SetDefaultKitAndConverter()
         Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
         SpeckleGHSettings.OnMeshSettingsChanged +=
           (sender, args) => Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
-        Converter.SetContextDocument(RhinoDoc.ActiveDoc);
+        Converter.SetContextDocument(Loader.GetCurrentDocument());
         foundKit = true;
       }
       catch
@@ -332,7 +332,7 @@ await client.CommitReceived(new CommitReceivedInput
         ReceivedObjectId = @base.id;
 
         //the active document may have changed
-        Converter?.SetContextDocument(RhinoDoc.ActiveDoc);
+        Converter?.SetContextDocument(Loader.GetCurrentDocument());
         var data = Extras.Utilities.ConvertToTree(Converter, @base, AddRuntimeMessage);
 
         DA.SetDataTree(0, data);
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.SendComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.SendComponent.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.SendComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.SendComponent.cs
index 8fa8bb76cf..5f0856583c 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.SendComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.SendComponent.cs
@@ -286,7 +286,7 @@ public override void DoWork(Action<string, double> ReportProgress, Action Done)
         }
 
         //the active document may have changed
-        sendComponent.Converter.SetContextDocument(RhinoDoc.ActiveDoc);
+        sendComponent.Converter.SetContextDocument(Loader.GetCurrentDocument());
 
         // Note: this method actually converts the objects to speckle too
         try
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.SendComponentSync.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.SendComponentSync.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.SendComponentSync.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.SendComponentSync.cs
index 454da594b9..ba26fc4d64 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.SendComponentSync.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.SendComponentSync.cs
@@ -176,7 +176,7 @@ private void SetDefaultKitAndConverter()
         Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
         SpeckleGHSettings.OnMeshSettingsChanged +=
           (sender, args) => Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
-        Converter.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+        Converter.SetContextDocument(Loader.GetCurrentDocument());
         foundKit = true;
       }
       catch
@@ -211,7 +211,7 @@ protected override void SolveInstance(IGH_DataAccess DA)
         DA.GetDataTree(0, out dataInput);
 
         //the active document may have changed
-        Converter.SetContextDocument(RhinoDoc.ActiveDoc);
+        Converter.SetContextDocument(Loader.GetCurrentDocument());
 
         // Note: this method actually converts the objects to speckle too
         converted = Extras.Utilities.DataTreeToNestedLists(dataInput, Converter, source.Token, () =>
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.UpgradeUtils.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.UpgradeUtils.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.UpgradeUtils.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.UpgradeUtils.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.VariableInputSendComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.VariableInputSendComponent.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.VariableInputSendComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.VariableInputSendComponent.cs
index 879b6c9f69..3e2f4fb9d8 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Deprecated/Operations.VariableInputSendComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Deprecated/Operations.VariableInputSendComponent.cs
@@ -350,7 +350,7 @@ public override void DoWork(Action<string, double> ReportProgress, Action Done)
         }
 
         //the active document may have changed
-        sendComponent.Converter.SetContextDocument(RhinoDoc.ActiveDoc);
+        sendComponent.Converter.SetContextDocument(Loader.GetCurrentDocument());
 
         // Note: this method actually converts the objects to speckle too
         ObjectToSend = new Base();
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.ReceiveLocalComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.ReceiveLocalComponent.cs
similarity index 98%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.ReceiveLocalComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.ReceiveLocalComponent.cs
index 979a5ac618..0b1811dea9 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.ReceiveLocalComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.ReceiveLocalComponent.cs
@@ -87,7 +87,7 @@ private void SetDefaultKitAndConverter()
         Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
         SpeckleGHSettings.OnMeshSettingsChanged +=
           (sender, args) => Converter.SetConverterSettings(SpeckleGHSettings.MeshSettings);
-        Converter.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+        Converter.SetContextDocument(Loader.GetCurrentDocument());
         foundKit = true;
       }
       catch
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.SendLocalComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.SendLocalComponent.cs
similarity index 97%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.SendLocalComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.SendLocalComponent.cs
index 31e9920254..b37e5d7fae 100755
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.SendLocalComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.SendLocalComponent.cs
@@ -63,7 +63,7 @@ public override void DoWork(Action<string, double> ReportProgress, Action Done)
       {
         Parent.Message = "Sending...";
         var converter = (Parent as SendLocalComponent)?.Converter;
-        converter?.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+        converter?.SetContextDocument(Loader.GetCurrentDocument());
         var converted = Utilities.DataTreeToNestedLists(data, converter);
         var ObjectToSend = new Base();
         ObjectToSend["@data"] = converted;
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.SyncReceiveComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.SyncReceiveComponent.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.SyncReceiveComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.SyncReceiveComponent.cs
index ceb1af1df8..7b2b27fd7f 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.SyncReceiveComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.SyncReceiveComponent.cs
@@ -249,7 +249,7 @@ await client.CommitReceived(new CommitReceivedInput
         ReceivedObjectId = @base.id;
 
         //the active document may have changed
-        Converter?.SetContextDocument(RhinoDoc.ActiveDoc);
+        Converter?.SetContextDocument(Loader.GetCurrentDocument());
 
 
         var data = Extras.Utilities.ConvertToTree(Converter, @base, AddRuntimeMessage, true);
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.SyncSendComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.SyncSendComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.SyncSendComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.SyncSendComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.VariableInputReceiveComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.VariableInputReceiveComponent.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.VariableInputReceiveComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.VariableInputReceiveComponent.cs
index f9f1c25156..48e02ae15b 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.VariableInputReceiveComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.VariableInputReceiveComponent.cs
@@ -772,7 +772,7 @@ public override void SetData(IGH_DataAccess DA)
 
       //the active document may have changed
       var converter = parent.Converter;
-      converter?.SetContextDocument(RhinoDoc.ActiveDoc);
+      converter?.SetContextDocument(Loader.GetCurrentDocument());
       parent.PrevReceivedData = new Dictionary<string, GH_Structure<IGH_Goo>>();
 
       if (!parent.ExpandOutput || (converter != null && converter.CanConvertToNative(ReceivedObject)))
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.VariableInputSendComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.VariableInputSendComponent.cs
similarity index 98%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.VariableInputSendComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.VariableInputSendComponent.cs
index a6fe800718..8ea46ea8b7 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Ops/Operations.VariableInputSendComponent.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Ops/Operations.VariableInputSendComponent.cs
@@ -368,7 +368,7 @@ public override void DoWork(Action<string, double> ReportProgress, Action Done)
         }
 
         //the active document may have changed
-        sendComponent.Converter.SetContextDocument(RhinoDoc.ActiveDoc);
+        sendComponent.Converter.SetContextDocument(Loader.GetCurrentDocument());
       
         if (!Helpers.UserHasInternet().Result)
         {
@@ -388,6 +388,7 @@ public override void DoWork(Action<string, double> ReportProgress, Action Done)
             {
               ReportProgress("Conversion", Math.Round(convertedCount++ / (double)d.Value.DataCount / DataInputs.Count, 2));
             });
+            
             convertedCount++;
             var param = Parent.Params.Input.Find(p => p.Name == d.Key || p.NickName == d.Key);
             var key = d.Key;
@@ -407,6 +408,11 @@ public override void DoWork(Action<string, double> ReportProgress, Action Done)
           }
         }
 
+        foreach (var error in sendComponent.Converter.Report.ConversionErrors)
+        {
+          RuntimeMessages.Add((GH_RuntimeMessageLevel.Warning, error.ToFormattedString()));
+        }
+        
         if (convertedCount == 0)
         {
           RuntimeMessages.Add((GH_RuntimeMessageLevel.Error, "Zero objects converted successfully. Send stopped."));
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Properties/Resources.Designer.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Properties/Resources.Designer.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Properties/Resources.Designer.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Properties/Resources.Designer.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Properties/Resources.resx b/ConnectorGrasshopper/ConnectorGrasshopperShared/Properties/Resources.resx
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Properties/Resources.resx
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Properties/Resources.resx
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/AccountDetails.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/AccountDetails.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/AccountDetails.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/AccountDetails.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/Accounts.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Accounts.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/Accounts.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Accounts.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/BaseParam.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/BaseParam.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/BaseParam.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/BaseParam.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/CreateSpeckleObject.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/CreateSpeckleObject.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/CreateSpeckleObject.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/CreateSpeckleObject.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/CreateSpeckleObjectByKeyValue.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/CreateSpeckleObjectByKeyValue.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/CreateSpeckleObjectByKeyValue.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/CreateSpeckleObjectByKeyValue.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/CreateStream.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/CreateStream.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/CreateStream.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/CreateStream.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/Deserialize.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Deserialize.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/Deserialize.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Deserialize.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/DiskTransport.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/DiskTransport.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/DiskTransport.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/DiskTransport.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/ExpandSpeckleObject.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ExpandSpeckleObject.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/ExpandSpeckleObject.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ExpandSpeckleObject.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/ExtendSpeckleObject.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ExtendSpeckleObject.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/ExtendSpeckleObject.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ExtendSpeckleObject.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/ExtendSpeckleObjectByKeyValue.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ExtendSpeckleObjectByKeyValue.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/ExtendSpeckleObjectByKeyValue.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ExtendSpeckleObjectByKeyValue.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/GetObjectValueByKey.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/GetObjectValueByKey.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/GetObjectValueByKey.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/GetObjectValueByKey.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/LocalReceiver.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/LocalReceiver.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/LocalReceiver.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/LocalReceiver.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/LocalSender.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/LocalSender.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/LocalSender.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/LocalSender.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/MemoryTransport.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/MemoryTransport.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/MemoryTransport.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/MemoryTransport.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/Receiver.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Receiver.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/Receiver.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Receiver.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/SQLiteTransport.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SQLiteTransport.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/SQLiteTransport.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SQLiteTransport.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/SchemaBuilder.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SchemaBuilder.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/SchemaBuilder.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SchemaBuilder.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/Sender.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Sender.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/Sender.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Sender.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/Serialize.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Serialize.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/Serialize.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/Serialize.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/ServerTransport.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ServerTransport.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/ServerTransport.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ServerTransport.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/SpeckleObjectKeysLogo.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SpeckleObjectKeysLogo.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/SpeckleObjectKeysLogo.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SpeckleObjectKeysLogo.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/SpeckleTag_Schema.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SpeckleTag_Schema.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/SpeckleTag_Schema.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SpeckleTag_Schema.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_Detach.Large.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_Detach.Large.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_Detach.Large.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_Detach.Large.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_Detach.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_Detach.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_Detach.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_Detach.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_List.Large.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_List.Large.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_List.Large.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_List.Large.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_List.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_List.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_List.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_List.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_Optional.Large.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_Optional.Large.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_Optional.Large.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_Optional.Large.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_Optional.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_Optional.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StateTag_Optional.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StateTag_Optional.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamDetails.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamDetails.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamDetails.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamDetails.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamGet.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamGet.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamGet.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamGet.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamList.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamList.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamList.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamList.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamParam.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamParam.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamParam.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamParam.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamUpdate.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamUpdate.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/StreamUpdate.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/StreamUpdate.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/SynchronousReceiver.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SynchronousReceiver.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/SynchronousReceiver.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SynchronousReceiver.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/SynchronousSender.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SynchronousSender.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/SynchronousSender.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/SynchronousSender.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/ToNative.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ToNative.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/ToNative.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ToNative.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/ToSpeckle.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ToSpeckle.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/ToSpeckle.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/ToSpeckle.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/docs16.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/docs16.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/docs16.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/docs16.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/forum16.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/forum16.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/forum16.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/forum16.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/help16.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/help16.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/help16.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/help16.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/receiveFromTransport.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/receiveFromTransport.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/receiveFromTransport.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/receiveFromTransport.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/sendToTransport.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/sendToTransport.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/sendToTransport.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/sendToTransport.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/speckle-logo-bw.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/speckle-logo-bw.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/speckle-logo-bw.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/speckle-logo-bw.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/speckle-logo.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/speckle-logo.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/speckle-logo.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/speckle-logo.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Resources/tutorials16.png b/ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/tutorials16.png
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Resources/tutorials16.png
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Resources/tutorials16.png
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CSOViewModel.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CSOViewModel.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CSOViewModel.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CSOViewModel.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CreateSchemaObject.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CreateSchemaObject.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CreateSchemaObject.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CreateSchemaObject.cs
index 0ac6f3d348..48cb3067ec 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CreateSchemaObject.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CreateSchemaObject.cs
@@ -357,7 +357,7 @@ protected override void SolveInstance(IGH_DataAccess DA)
         Tracker.TrackNodeRun("Create Schema Object", Name);
 
 
-      var units = Units.GetUnitsFromString(Rhino.RhinoDoc.ActiveDoc.ModelUnitSystem.ToString());
+      var units = Units.GetUnitsFromString(Loader.GetCurrentDocument().ModelUnitSystem.ToString());
 
       List<object> cParamsValues = new List<object>();
       var cParams = SelectedConstructor.GetParameters();
@@ -621,7 +621,7 @@ public void VariableParameterMaintenance()
 
     protected override void BeforeSolveInstance()
     {
-      Converter?.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+      Converter?.SetContextDocument(Loader.GetCurrentDocument());
       base.BeforeSolveInstance();
     }
   }
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CreateSchemaObjectBase.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CreateSchemaObjectBase.cs
similarity index 99%
rename from ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CreateSchemaObjectBase.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CreateSchemaObjectBase.cs
index 8518f74d15..7af99b5f29 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CreateSchemaObjectBase.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CreateSchemaObjectBase.cs
@@ -343,7 +343,7 @@ protected override void SolveInstance(IGH_DataAccess DA)
         Tracker.TrackNodeRun("Create Schema Object", Name);
 
 
-      var units = Units.GetUnitsFromString(Rhino.RhinoDoc.ActiveDoc.ModelUnitSystem.ToString());
+      var units = Units.GetUnitsFromString(Loader.GetCurrentDocument().ModelUnitSystem.ToString());
 
       List<object> cParamsValues = new List<object>();
       var cParams = SelectedConstructor.GetParameters();
@@ -611,7 +611,7 @@ public void VariableParameterMaintenance()
 
     protected override void BeforeSolveInstance()
     {
-      Converter?.SetContextDocument(Rhino.RhinoDoc.ActiveDoc);
+      Converter?.SetContextDocument(Loader.GetCurrentDocument());
       base.BeforeSolveInstance();
     }
   }
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CreateSchemaObjectDialog.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CreateSchemaObjectDialog.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/CreateSchemaObjectDialog.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/CreateSchemaObjectDialog.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/SchemaBuilderGen.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/SchemaBuilderGen.cs
new file mode 100644
index 0000000000..23d33eccd4
--- /dev/null
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/SchemaBuilderGen.cs
@@ -0,0 +1,5838 @@
+
+
+using System;
+using System.Linq;
+using Grasshopper.Kernel;
+using ConnectorGrasshopperUtils;
+
+namespace ConnectorGrasshopper {
+// This is generated code:
+public class AdaptiveComponentSchemaComponent: CreateSchemaObjectBase {
+    static AdaptiveComponentSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public AdaptiveComponentSchemaComponent(): base("AdaptiveComponent", "AdaptiveComponent", "Creates a Revit adaptive component by points", "Speckle 2 Revit", "Families") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("71420d27-62d1-f158-edab-a89e54604d76");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.AdaptiveComponent.ctor(System.String,System.String,System.Collections.Generic.List`1[Objects.Geometry.Point],System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.AdaptiveComponent");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class AngleSchemaComponent: CreateSchemaObjectBase {
+    static AngleSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public AngleSchemaComponent(): base("Angle", "Angle", "Creates a Speckle structural angle section profile", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("91df837b-3162-a0de-724d-ea182e77e68c");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Angle.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Angle");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ArchicadBeamSchemaComponent: CreateSchemaObjectBase {
+    static ArchicadBeamSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ArchicadBeamSchemaComponent(): base("ArchicadBeam", "ArchicadBeam", "Creates an Archicad Structures beam by curve.", "Speckle 2 Archicad", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Archicad";
+
+    internal static Guid internalGuid => new Guid("73860182-c94b-d570-f568-1ab73eec8bfd");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Archicad.ArchicadBeam.ctor(Objects.Geometry.Point,Objects.Geometry.Point)","Objects.BuiltElements.Archicad.ArchicadBeam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class AreaSchemaComponent: CreateSchemaObjectBase {
+    static AreaSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public AreaSchemaComponent(): base("Area", "Area", "Creates a Speckle area", "Speckle 2 BIM", "Other") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("b98bd134-1ebd-b805-821c-465f1a25fb4e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Area.ctor(System.String,System.String,Objects.BuiltElements.Level,Objects.Geometry.Point)","Objects.BuiltElements.Area");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class AxisSchemaComponent: CreateSchemaObjectBase {
+    static AxisSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public AxisSchemaComponent(): base("Axis", "Axis", "Creates a Speckle structural axis (a user-defined axis)", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("38fdc896-0404-4961-120f-6e373d19edbc");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Axis.ctor(System.String,Objects.Structural.AxisType,Objects.Geometry.Plane)","Objects.Structural.Geometry.Axis");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class BeamSchemaComponent: CreateSchemaObjectBase {
+    static BeamSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public BeamSchemaComponent(): base("Beam", "Beam", "Creates a Speckle beam", "Speckle 2 BIM", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("5c0a392e-bc1c-cf28-0048-a99ee090ffa1");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Beam.ctor(Objects.ICurve)","Objects.BuiltElements.Beam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class BlockDefinitionSchemaComponent: CreateSchemaObjectBase {
+    static BlockDefinitionSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public BlockDefinitionSchemaComponent(): base("Block Definition", "Block Definition", "A Speckle Block definition", "Speckle 2 BIM", "Objects.Other") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("91f1164e-b519-d72f-d64b-e68bb14836e3");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.BlockDefinition.ctor(System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Point)","Objects.Other.BlockDefinition");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class BlockInstanceSchemaComponent: CreateSchemaObjectBase {
+    static BlockInstanceSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public BlockInstanceSchemaComponent(): base("Block Instance", "Block Instance", "A Speckle Block Instance", "Speckle 2 BIM", "Objects.Other") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("28238ece-f2e0-fe7d-e25f-e8f8cb35e629");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.BlockInstance.ctor(Objects.Other.BlockDefinition,Objects.Other.Transform)","Objects.Other.BlockInstance");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class BraceSchemaComponent: CreateSchemaObjectBase {
+    static BraceSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public BraceSchemaComponent(): base("Brace", "Brace", "Creates a Speckle brace", "Speckle 2 BIM", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("cf5f1dad-80cd-d499-2ef7-6ae1f8d34a5c");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Brace.ctor(Objects.ICurve)","Objects.BuiltElements.Brace");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CatalogueSchemaComponent: CreateSchemaObjectBase {
+    static CatalogueSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CatalogueSchemaComponent(): base("Catalogue (by description)", "Catalogue (by description)", "Creates a Speckle structural section profile based on a catalogue section description", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("7e0f97be-7297-64f8-fc85-f43623186129");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Catalogue.ctor(System.String)","Objects.Structural.Properties.Profiles.Catalogue");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Catalogue1SchemaComponent: CreateSchemaObjectBase {
+    static Catalogue1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Catalogue1SchemaComponent(): base("Catalogue", "Catalogue", "Creates a Speckle structural section profile", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("1b5a50a5-4b3d-1018-8e3f-bb34ad0af7ff");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Catalogue.ctor(System.String,System.String,System.String,System.String)","Objects.Structural.Properties.Profiles.Catalogue");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CeilingSchemaComponent: CreateSchemaObjectBase {
+    static CeilingSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CeilingSchemaComponent(): base("Ceiling", "Ceiling", "Creates a Speckle ceiling", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("91b38d18-dd01-dfc7-f11d-e3d2c118ff0b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Ceiling.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Ceiling");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ChannelSchemaComponent: CreateSchemaObjectBase {
+    static ChannelSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ChannelSchemaComponent(): base("Channel", "Channel", "Creates a Speckle structural channel section profile", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("40336db1-decb-2ad6-6680-01c457f0f31d");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Channel.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Channel");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CircularSchemaComponent: CreateSchemaObjectBase {
+    static CircularSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CircularSchemaComponent(): base("Circular", "Circular", "Creates a Speckle structural circular section profile", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("fbf190e3-c085-dfc9-3b49-bcda58ab931f");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Circular.ctor(System.String,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Circular");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ColumnSchemaComponent: CreateSchemaObjectBase {
+    static ColumnSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ColumnSchemaComponent(): base("Column", "Column", "Creates a Speckle column", "Speckle 2 BIM", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("d92fc447-81b6-e595-1905-6239ea13a49b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Column.ctor(Objects.ICurve)","Objects.BuiltElements.Column");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ConcreteSchemaComponent: CreateSchemaObjectBase {
+    static ConcreteSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ConcreteSchemaComponent(): base("Concrete", "Concrete", "Creates a Speckle structural material for concrete (to be used in structural analysis models)", "Speckle 2 Structural", "Materials") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("104f1e8d-a551-bb84-e671-3394bc6a4c2b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.Concrete.ctor(System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Boolean,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Materials.Concrete");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSIAreaSpringSchemaComponent: CreateSchemaObjectBase {
+    static CSIAreaSpringSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSIAreaSpringSchemaComponent(): base("LinearSpring", "LinearSpring", "Create an CSI AreaSpring", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("f1b019ec-dac8-2669-a790-818aabd77c81");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIAreaSpring.ctor(System.String,System.Double,System.Double,System.Double,Objects.Structural.CSI.Properties.NonLinearOptions,System.String)","Objects.Structural.CSI.Properties.CSIAreaSpring");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSIDiaphragmSchemaComponent: CreateSchemaObjectBase {
+    static CSIDiaphragmSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSIDiaphragmSchemaComponent(): base("CSI Diaphragm", "CSI Diaphragm", "Create an CSI Diaphragm", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("97f96eaa-f4f3-ef29-0de3-63829f163dc1");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIDiaphragm.ctor(System.String,System.Boolean)","Objects.Structural.CSI.Properties.CSIDiaphragm");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSIElement1DSchemaComponent: CreateSchemaObjectBase {
+    static CSIElement1DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSIElement1DSchemaComponent(): base("Element1D (from local axis)", "Element1D (from local axis)", "Creates a Speckle CSI 1D element (from local axis)", "Speckle 2 CSI", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("b19522f8-4264-ce56-3cc7-ec2132ece2e1");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Geometry.CSIElement1D.ctor(Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Geometry.Plane,Objects.Structural.CSI.Properties.CSILinearSpring,System.Double[],Objects.Structural.CSI.Properties.DesignProcedure)","Objects.Structural.CSI.Geometry.CSIElement1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSIElement1D1SchemaComponent: CreateSchemaObjectBase {
+    static CSIElement1D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSIElement1D1SchemaComponent(): base("Element1D (from orientation node and angle)", "Element1D (from orientation node and angle)", "Creates a Speckle CSI 1D element (from orientation node and angle)", "Speckle 2 CSI", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("95254c64-1e71-0902-06a1-206b2f17b844");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Geometry.CSIElement1D.ctor(Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Structural.Geometry.Node,System.Double,Objects.Structural.CSI.Properties.CSILinearSpring,System.Double[],Objects.Structural.CSI.Properties.DesignProcedure)","Objects.Structural.CSI.Geometry.CSIElement1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSIElement2DSchemaComponent: CreateSchemaObjectBase {
+    static CSIElement2DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSIElement2DSchemaComponent(): base("Element2D", "Element2D", "Creates a Speckle CSI 2D element (based on a list of edge ie. external, geometry defining nodes)", "Speckle 2 CSI", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("33c58e3c-d8cb-86ca-b494-ee5c69ec7b14");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Geometry.CSIElement2D.ctor(System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Properties.Property2D,System.Double,System.Double,System.Double[],Objects.Structural.CSI.Properties.CSIAreaSpring,Objects.Structural.CSI.Properties.CSIDiaphragm)","Objects.Structural.CSI.Geometry.CSIElement2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSILinearSpringSchemaComponent: CreateSchemaObjectBase {
+    static CSILinearSpringSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSILinearSpringSchemaComponent(): base("LinearSpring", "LinearSpring", "Create an CSI LinearSpring", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("a81ebbcb-78a6-9f21-5212-09701d89fa5d");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSILinearSpring.ctor(System.String,System.Double,System.Double,System.Double,System.Double,Objects.Structural.CSI.Properties.NonLinearOptions,Objects.Structural.CSI.Properties.NonLinearOptions,System.String)","Objects.Structural.CSI.Properties.CSILinearSpring");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSILinkPropertySchemaComponent: CreateSchemaObjectBase {
+    static CSILinkPropertySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSILinkPropertySchemaComponent(): base("CSILink", "CSILink", "Create an CSI Link Property", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("0d7960c0-ddc2-fa77-3b52-fd4d1587af32");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSILinkProperty.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSILinkProperty");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSINodeSchemaComponent: CreateSchemaObjectBase {
+    static CSINodeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSINodeSchemaComponent(): base("Node with properties", "Node with properties", "Creates a Speckle CSI node with spring, mass and/or damper properties", "Speckle 2 CSI", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("2c39977e-f47f-3202-c778-ac46b8462fea");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Geometry.CSINode.ctor(Objects.Geometry.Point,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Axis,Objects.Structural.CSI.Properties.CSISpringProperty,Objects.Structural.Properties.PropertyMass,Objects.Structural.Properties.PropertyDamper,Objects.Structural.CSI.Properties.CSIDiaphragm,Objects.Structural.CSI.Properties.DiaphragmOption)","Objects.Structural.CSI.Geometry.CSINode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSIOpeningSchemaComponent: CreateSchemaObjectBase {
+    static CSIOpeningSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSIOpeningSchemaComponent(): base("Opening", "Opening", "Create an CSI Opening", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("e6405aac-40ff-97c5-66d7-be3586eebbdd");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIOpening.ctor(System.Boolean)","Objects.Structural.CSI.Properties.CSIOpening");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSISpringPropertySchemaComponent: CreateSchemaObjectBase {
+    static CSISpringPropertySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSISpringPropertySchemaComponent(): base("PointSpring from Link", "PointSpring from Link", "Create an CSI PointSpring from Link", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("efa38436-affe-3ba9-2413-743fe26eb9f7");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSISpringProperty.ctor(System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSISpringProperty");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class CSISpringProperty1SchemaComponent: CreateSchemaObjectBase {
+    static CSISpringProperty1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public CSISpringProperty1SchemaComponent(): base("PointSpring from Soil Profile", "PointSpring from Soil Profile", "Create an CSI PointSpring from Soil Profile", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("9b2854b3-f8bc-b8e6-fd86-aa5c55051759");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSISpringProperty.ctor(System.String,System.String,System.String,System.Double)","Objects.Structural.CSI.Properties.CSISpringProperty");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class DeckFilledSchemaComponent: CreateSchemaObjectBase {
+    static DeckFilledSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public DeckFilledSchemaComponent(): base("DeckFilled", "DeckFilled", "Create an CSI Filled Deck", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("151a2166-f739-501f-d3bc-f1a24bdd4093");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+DeckFilled.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+DeckFilled");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class DeckSlabSchemaComponent: CreateSchemaObjectBase {
+    static DeckSlabSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public DeckSlabSchemaComponent(): base("DeckSlab", "DeckSlab", "Create an CSI Slab Deck", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("b8102cde-4ea3-0583-9580-4a9530154440");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+DeckSlab.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+DeckSlab");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class DeckUnFilledSchemaComponent: CreateSchemaObjectBase {
+    static DeckUnFilledSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public DeckUnFilledSchemaComponent(): base("DeckUnFilled", "DeckUnFilled", "Create an CSI UnFilled Deck", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("680e6f0c-d140-e8c4-27e1-28d353a87b8f");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+DeckUnFilled.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+DeckUnFilled");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class DetailCurveSchemaComponent: CreateSchemaObjectBase {
+    static DetailCurveSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public DetailCurveSchemaComponent(): base("DetailCurve", "DetailCurve", "Creates a Revit detail curve", "Speckle 2 Revit", "Curves") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("4752d321-22cc-2d9e-dc6d-e3cf8e70c612");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Curve.DetailCurve.ctor(Objects.ICurve,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.Curve.DetailCurve");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class DirectShapeSchemaComponent: CreateSchemaObjectBase {
+    static DirectShapeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public DirectShapeSchemaComponent(): base("DirectShape by base geometries", "DirectShape by base geometries", "Creates a Revit DirectShape using a list of base geometry objects.", "Speckle 2 Revit", "Families") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("870d9670-cbf5-06d2-f371-e1e49212b063");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.DirectShape.ctor(System.String,Objects.BuiltElements.Revit.RevitCategory,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.DirectShape");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class DuctSchemaComponent: CreateSchemaObjectBase {
+    static DuctSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public DuctSchemaComponent(): base("Duct", "Duct", "Creates a Speckle duct", "Speckle 2 BIM", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("51d40791-43ea-a8e7-ef13-e9bfdf9cd893");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override bool Obsolete => true;
+    public override GH_Exposure Exposure => GH_Exposure.hidden;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Duct.ctor(Objects.Geometry.Line,System.Double,System.Double,System.Double,System.Double)","Objects.BuiltElements.Duct");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Duct1SchemaComponent: CreateSchemaObjectBase {
+    static Duct1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Duct1SchemaComponent(): base("Duct", "Duct", "Creates a Speckle duct", "Speckle 2 BIM", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("7e3a3fba-7d4f-d549-96c0-41693b512db0");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Duct.ctor(Objects.ICurve,System.Double,System.Double,System.Double,System.Double)","Objects.BuiltElements.Duct");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Element1DSchemaComponent: CreateSchemaObjectBase {
+    static Element1DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Element1DSchemaComponent(): base("Element1D (from local axis)", "Element1D (from local axis)", "Creates a Speckle structural 1D element (from local axis)", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("9fffb53b-3465-7a5b-4839-91cfdcb86f63");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Element1D.ctor(Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Geometry.Plane)","Objects.Structural.Geometry.Element1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Element1D1SchemaComponent: CreateSchemaObjectBase {
+    static Element1D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Element1D1SchemaComponent(): base("Element1D (from orientation node and angle)", "Element1D (from orientation node and angle)", "Creates a Speckle structural 1D element (from orientation node and angle)", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("6cb2d683-3116-0246-18b0-1bd35ed8fcc6");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Element1D.ctor(Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Structural.Geometry.Node,System.Double)","Objects.Structural.Geometry.Element1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Element2DSchemaComponent: CreateSchemaObjectBase {
+    static Element2DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Element2DSchemaComponent(): base("Element2D", "Element2D", "Creates a Speckle structural 2D element (based on a list of edge ie. external, geometry defining nodes)", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("0927879c-d28c-1c35-0d3f-4ba8e324ec39");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Element2D.ctor(System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Properties.Property2D,System.Double,System.Double)","Objects.Structural.Geometry.Element2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Element3DSchemaComponent: CreateSchemaObjectBase {
+    static Element3DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Element3DSchemaComponent(): base("Element3D", "Element3D", "Creates a Speckle structural 3D element", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("54b79bd6-7a50-2107-afd5-f9b18346f8ea");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Element3D.ctor(Objects.Geometry.Mesh,Objects.Structural.Properties.Property3D,Objects.Structural.Geometry.ElementType3D,System.String,System.Double)","Objects.Structural.Geometry.Element3D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ExplicitSchemaComponent: CreateSchemaObjectBase {
+    static ExplicitSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ExplicitSchemaComponent(): base("Explicit", "Explicit", "Creates a Speckle structural section profile based on explicitly defining geometric properties", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("e15a7edd-4559-0bb6-3559-48b72c43da2e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Explicit.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Explicit");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class FamilyInstanceSchemaComponent: CreateSchemaObjectBase {
+    static FamilyInstanceSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public FamilyInstanceSchemaComponent(): base("FamilyInstance", "FamilyInstance", "Creates a Revit family instance", "Speckle 2 Revit", "Families") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("266c4d84-3f2a-9129-565b-0ddb1e5bdac4");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.FamilyInstance.ctor(Objects.Geometry.Point,System.String,System.String,Objects.BuiltElements.Level,System.Double,System.Boolean,System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.FamilyInstance");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class FloorSchemaComponent: CreateSchemaObjectBase {
+    static FloorSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public FloorSchemaComponent(): base("Floor", "Floor", "Creates a Speckle floor", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("74c5b6bf-257e-8d4e-d9cb-7dc2c7ae3f22");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Floor.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Floor");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class FreeformElementSchemaComponent: CreateSchemaObjectBase {
+    static FreeformElementSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public FreeformElementSchemaComponent(): base("Freeform element", "Freeform element", "Creates a Revit Freeform element using a list of Brep or Meshes. Category defaults to Generic Models", "Speckle 2 Revit", "Families") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("b24dc861-1c3c-a509-bc8b-560e9f7d503e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.FreeformElement.ctor(System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.FreeformElement");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class FreeformElement1SchemaComponent: CreateSchemaObjectBase {
+    static FreeformElement1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public FreeformElement1SchemaComponent(): base("Freeform element", "Freeform element", "Creates a Revit Freeform element using a list of Brep or Meshes.", "Speckle 2 Revit", "Families") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("d1bb3f50-6abc-9f34-acf3-297e82bbd8ac");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override bool Obsolete => true;
+    public override GH_Exposure Exposure => GH_Exposure.hidden;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.FreeformElement.ctor(Speckle.Core.Models.Base,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.FreeformElement");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class FreeformElement2SchemaComponent: CreateSchemaObjectBase {
+    static FreeformElement2SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public FreeformElement2SchemaComponent(): base("Freeform element", "Freeform element", "Creates a Revit Freeform element using a list of Brep or Meshes.", "Speckle 2 Revit", "Families") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("d1a2299d-b8b0-ce4a-6a52-8b8ad95acbfd");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override bool Obsolete => true;
+    public override GH_Exposure Exposure => GH_Exposure.hidden;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.FreeformElement.ctor(System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.FreeformElement");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GridLineSchemaComponent: CreateSchemaObjectBase {
+    static GridLineSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GridLineSchemaComponent(): base("GridLine", "GridLine", "Creates a Speckle grid line", "Speckle 2 BIM", "Other") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("b2d4bd71-86a7-c142-7220-d9ed2ee7b02e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override bool Obsolete => true;
+    public override GH_Exposure Exposure => GH_Exposure.hidden;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.GridLine.ctor(Objects.ICurve)","Objects.BuiltElements.GridLine");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GridLine1SchemaComponent: CreateSchemaObjectBase {
+    static GridLine1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GridLine1SchemaComponent(): base("GridLine", "GridLine", "Creates a Speckle grid line with a label", "Speckle 2 BIM", "Other") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("436f3773-b3f9-1a35-684e-a75f25f6c3bd");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.GridLine.ctor(Objects.ICurve,System.String)","Objects.BuiltElements.GridLine");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAAlignmentSchemaComponent: CreateSchemaObjectBase {
+    static GSAAlignmentSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAAlignmentSchemaComponent(): base("GSAAlignment", "GSAAlignment", "Creates a Speckle structural alignment for GSA (as a setting out feature for bridge models)", "Speckle 2 GSA", "Bridge") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("fc274806-efb5-c3b2-9c1d-bc9a6aba1a34");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAAlignment.ctor(System.Int32,System.String,Objects.Structural.GSA.Geometry.GSAGridSurface,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Bridge.GSAAlignment");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAAnalysisCaseSchemaComponent: CreateSchemaObjectBase {
+    static GSAAnalysisCaseSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAAnalysisCaseSchemaComponent(): base("GSAAnalysisCase", "GSAAnalysisCase", "Creates a Speckle structural analysis case for GSA", "Speckle 2 GSA", "Analysis") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("4bfc261f-98eb-7b2a-5da6-f2ef3505b9b7");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Analysis.GSAAnalysisCase.ctor(System.Int32,System.String,Objects.Structural.GSA.Analysis.GSATask,System.Collections.Generic.List`1[Objects.Structural.Loading.LoadCase],System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Analysis.GSAAnalysisCase");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAAssemblySchemaComponent: CreateSchemaObjectBase {
+    static GSAAssemblySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAAssemblySchemaComponent(): base("GSAAssembly", "GSAAssembly", "Creates a Speckle structural assembly (ie. a way to define an entity that is formed from a collection of elements or members) for GSA", "Speckle 2 GSA", "Bridge") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("9b2c7be3-5172-7660-659a-e39253688363");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAAssembly.ctor(System.Int32,System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.GSA.Geometry.GSANode,Objects.Structural.GSA.Geometry.GSANode,Objects.Structural.GSA.Geometry.GSANode,System.Double,System.Double,System.String,System.Int32,System.String,System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Geometry.GSAAssembly");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAConcreteSchemaComponent: CreateSchemaObjectBase {
+    static GSAConcreteSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAConcreteSchemaComponent(): base("GSAConcrete", "GSAConcrete", "Creates a Speckle structural concrete material for GSA", "Speckle 2 GSA", "Materials") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("a86c1d31-6807-f465-c51c-24d5d7a5a728");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Materials.GSAConcrete.ctor(System.Int32,System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Boolean,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.String)","Objects.Structural.GSA.Materials.GSAConcrete");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAElement1DSchemaComponent: CreateSchemaObjectBase {
+    static GSAElement1DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAElement1DSchemaComponent(): base("GSAElement1D (from local axis)", "GSAElement1D (from local axis)", "Creates a Speckle structural 1D element for GSA (from local axis)", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("8b41c9e5-f24b-f0bc-7b62-169f839883ec");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAElement1D.ctor(System.Int32,Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Geometry.Plane)","Objects.Structural.GSA.Geometry.GSAElement1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAElement1D1SchemaComponent: CreateSchemaObjectBase {
+    static GSAElement1D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAElement1D1SchemaComponent(): base("GSAElement1D (from orientation node and angle)", "GSAElement1D (from orientation node and angle)", "Creates a Speckle structural 1D element for GSA (from orientation node and angle)", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("d3ff71ed-34b8-6f9b-7ebc-50ff8195d1b2");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAElement1D.ctor(System.Int32,Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Structural.Geometry.Node,System.Double)","Objects.Structural.GSA.Geometry.GSAElement1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAElement2DSchemaComponent: CreateSchemaObjectBase {
+    static GSAElement2DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAElement2DSchemaComponent(): base("GSAElement2D", "GSAElement2D", "Creates a Speckle structural 2D element for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("9a1c5132-a785-c389-fe5f-441820f07446");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAElement2D.ctor(System.Int32,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Properties.Property2D,Objects.Structural.Geometry.ElementType2D,System.String,System.Double,System.Double,System.Int32,System.String,System.Boolean)","Objects.Structural.GSA.Geometry.GSAElement2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAElement3DSchemaComponent: CreateSchemaObjectBase {
+    static GSAElement3DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAElement3DSchemaComponent(): base("GSAElement3D", "GSAElement3D", "Creates a Speckle structural 3D element for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("3fb3f410-62f0-f972-de47-4e55d8aee0b6");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAElement3D.ctor(System.Int32,Objects.Geometry.Mesh,Objects.Structural.Properties.Property3D,Objects.Structural.Geometry.ElementType3D,System.String,System.Double,System.Int32,System.String,System.Boolean)","Objects.Structural.GSA.Geometry.GSAElement3D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAGeneralisedRestraintSchemaComponent: CreateSchemaObjectBase {
+    static GSAGeneralisedRestraintSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAGeneralisedRestraintSchemaComponent(): base("GSAGeneralisedRestraint", "GSAGeneralisedRestraint", "Creates a Speckle structural generalised restraint (a set of restraint conditions to be applied to a list of nodes) for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("e3b018a2-2196-d3aa-a66a-3248343143aa");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAGeneralisedRestraint.ctor(System.Int32,System.String,Objects.Structural.Geometry.Restraint,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],System.Collections.Generic.List`1[Objects.Structural.GSA.Analysis.GSAStage])","Objects.Structural.GSA.Geometry.GSAGeneralisedRestraint");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAGridLineSchemaComponent: CreateSchemaObjectBase {
+    static GSAGridLineSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAGridLineSchemaComponent(): base("GSAGridLine", "GSAGridLine", "Creates a Speckle structural grid line for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("1fdfd333-8214-4f28-1835-7609247412ac");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAGridLine.ctor(System.Int32,System.String,Objects.ICurve)","Objects.Structural.GSA.Geometry.GSAGridLine");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAGridPlaneSchemaComponent: CreateSchemaObjectBase {
+    static GSAGridPlaneSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAGridPlaneSchemaComponent(): base("GSAGridPlane", "GSAGridPlane", "Creates a Speckle structural grid plane for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("f7db7fc7-c05e-c257-c11c-7d3a3e7ecdfc");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAGridPlane.ctor(System.Int32,System.String,Objects.Structural.Geometry.Axis,System.Double)","Objects.Structural.GSA.Geometry.GSAGridPlane");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAGridSurfaceSchemaComponent: CreateSchemaObjectBase {
+    static GSAGridSurfaceSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAGridSurfaceSchemaComponent(): base("GSAGridSurface", "GSAGridSurface", "Creates a Speckle structural grid surface for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("868d0f73-da31-e362-f5c5-c2e5a98f0f46");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAGridSurface.ctor(System.String,System.Int32,Objects.Structural.GSA.Geometry.GSAGridPlane,System.Double,System.Double,Objects.Structural.GSA.Geometry.LoadExpansion,Objects.Structural.GSA.Geometry.GridSurfaceSpanType,System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.Structural.GSA.Geometry.GSAGridSurface");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAInfluenceBeamSchemaComponent: CreateSchemaObjectBase {
+    static GSAInfluenceBeamSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAInfluenceBeamSchemaComponent(): base("GSAInfluenceBeam", "GSAInfluenceBeam", "Creates a Speckle structural beam influence effect for GSA (for an influence analysis)", "Speckle 2 GSA", "Bridge") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("8844e443-368c-0b7d-89d8-fc563aa7a56d");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAInfluenceBeam.ctor(System.Int32,System.String,System.Double,Objects.Structural.GSA.Bridge.InfluenceType,Objects.Structural.Loading.LoadDirection,Objects.Structural.GSA.Geometry.GSAElement1D,System.Double)","Objects.Structural.GSA.Bridge.GSAInfluenceBeam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAInfluenceNodeSchemaComponent: CreateSchemaObjectBase {
+    static GSAInfluenceNodeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAInfluenceNodeSchemaComponent(): base("GSAInfluenceBeam", "GSAInfluenceBeam", "Creates a Speckle structural node influence effect for GSA (for an influence analysis)", "Speckle 2 GSA", "Bridge") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("61efde90-bb48-abf4-e69a-87376cab33bd");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAInfluenceNode.ctor(System.Int32,System.String,System.Double,Objects.Structural.GSA.Bridge.InfluenceType,Objects.Structural.Loading.LoadDirection,Objects.Structural.Geometry.Node,Objects.Structural.Geometry.Axis)","Objects.Structural.GSA.Bridge.GSAInfluenceNode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadBeamSchemaComponent: CreateSchemaObjectBase {
+    static GSALoadBeamSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadBeamSchemaComponent(): base("GSALoadBeam", "GSALoadBeam", "Creates a Speckle structural beam (1D elem/member) load for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("eb5a5098-d189-58ab-d032-60dfdd6e5495");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadBeam.ctor(System.Int32,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.BeamLoadType,Objects.Structural.Loading.LoadDirection,Objects.Structural.LoadAxisType,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean)","Objects.Structural.GSA.Loading.GSALoadBeam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadBeam1SchemaComponent: CreateSchemaObjectBase {
+    static GSALoadBeam1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadBeam1SchemaComponent(): base("GSALoadBeam (user-defined axis)", "GSALoadBeam (user-defined axis)", "Creates a Speckle structural beam (1D elem/member) load (specified for a user-defined axis) for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("29927efe-6612-a3f7-a0c7-49ef97bea3ae");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadBeam.ctor(System.Int32,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.BeamLoadType,Objects.Structural.Loading.LoadDirection,Objects.Structural.Geometry.Axis,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean)","Objects.Structural.GSA.Loading.GSALoadBeam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadCaseSchemaComponent: CreateSchemaObjectBase {
+    static GSALoadCaseSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadCaseSchemaComponent(): base("GSALoadCase", "GSALoadCase", "Creates a Speckle structural load case for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("3d862f90-6804-d75c-a0e2-8e90c9b190db");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadCase.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadType,Objects.Structural.Loading.LoadDirection2D,System.String,Objects.Structural.Loading.ActionType,System.String,System.String,System.Boolean)","Objects.Structural.GSA.Loading.GSALoadCase");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadCombinationSchemaComponent: CreateSchemaObjectBase {
+    static GSALoadCombinationSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadCombinationSchemaComponent(): base("GSALoadCombination", "GSALoadCombination", "Creates a Speckle load combination for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("a79c8825-221a-d44f-5faa-b257f3f6c98e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadCombination.ctor(System.Int32,System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Loading.GSALoadCombination");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadFaceSchemaComponent: CreateSchemaObjectBase {
+    static GSALoadFaceSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadFaceSchemaComponent(): base("GSALoadFace", "GSALoadFace", "Creates a Speckle structural face (2D elem/member) load for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("abc889bd-7235-5b08-9f91-124a4dd94c7a");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadFace.ctor(System.Int32,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.FaceLoadType,Objects.Structural.Loading.LoadDirection2D,Objects.Structural.LoadAxisType,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean)","Objects.Structural.GSA.Loading.GSALoadFace");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadGravitySchemaComponent: CreateSchemaObjectBase {
+    static GSALoadGravitySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadGravitySchemaComponent(): base("GSALoadGravity", "GSALoadGravity", "Creates a Speckle structural gravity load (applied to all nodes and elements) for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("a49dd14b-f073-b628-f175-030c5cee8d3b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadGravity.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,Objects.Geometry.Vector)","Objects.Structural.GSA.Loading.GSALoadGravity");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadGravity1SchemaComponent: CreateSchemaObjectBase {
+    static GSALoadGravity1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadGravity1SchemaComponent(): base("GSALoadGravity (specified elements)", "GSALoadGravity (specified elements)", "Creates a Speckle structural gravity load (applied to specified elements) for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("6b27dc40-c384-1058-d7ab-eaf6bcd19587");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadGravity.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Vector)","Objects.Structural.GSA.Loading.GSALoadGravity");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadGravity2SchemaComponent: CreateSchemaObjectBase {
+    static GSALoadGravity2SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadGravity2SchemaComponent(): base("GSALoadGravity (specified elements and nodes)", "GSALoadGravity (specified elements and nodes)", "Creates a Speckle structural gravity load (applied to specified nodes and elements) for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("05096aa4-f73a-01d0-5613-1184349cb0ea");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadGravity.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Vector,System.String)","Objects.Structural.GSA.Loading.GSALoadGravity");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadNodeSchemaComponent: CreateSchemaObjectBase {
+    static GSALoadNodeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadNodeSchemaComponent(): base("GSALoadNode", "GSALoadNode", "Creates a Speckle node load for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("8a591a6c-207c-f42a-d2f4-596594a536a7");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadNode.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Objects.Structural.GSA.Geometry.GSANode],Objects.Structural.Loading.LoadDirection,System.Double)","Objects.Structural.GSA.Loading.GSALoadNode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSALoadNode1SchemaComponent: CreateSchemaObjectBase {
+    static GSALoadNode1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSALoadNode1SchemaComponent(): base("GSALoadNode (user-defined axis)", "GSALoadNode (user-defined axis)", "Creates a Speckle node load (user-defined axis) for GSA", "Speckle 2 GSA", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("d641ad56-fa70-fd1f-7066-412a8e15970e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSALoadNode.ctor(System.Int32,System.String,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Geometry.Axis,Objects.Structural.Loading.LoadDirection,System.Double)","Objects.Structural.GSA.Loading.GSALoadNode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAMaterialSchemaComponent: CreateSchemaObjectBase {
+    static GSAMaterialSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAMaterialSchemaComponent(): base("GSAMaterial", "GSAMaterial", "Creates a Speckle structural material for GSA", "Speckle 2 GSA", "Materials") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("6e7d020a-4a4b-9f9a-f573-222476220b2c");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Materials.GSAMaterial.ctor(System.Int32,System.String,Objects.Structural.MaterialType,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.String)","Objects.Structural.GSA.Materials.GSAMaterial");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAMember1DSchemaComponent: CreateSchemaObjectBase {
+    static GSAMember1DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAMember1DSchemaComponent(): base("GSAMember1D (from local axis)", "GSAMember1D (from local axis)", "Creates a Speckle structural 1D member for GSA (from local axis)", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("e86d92aa-cefd-5a09-138d-a1cd1fe36e7d");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAMember1D.ctor(System.Int32,Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Geometry.Plane)","Objects.Structural.GSA.Geometry.GSAMember1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAMember1D1SchemaComponent: CreateSchemaObjectBase {
+    static GSAMember1D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAMember1D1SchemaComponent(): base("GSAMember1D (from orientation node and angle)", "GSAMember1D (from orientation node and angle)", "Creates a Speckle structural 1D member for GSA (from orientation node and angle)", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("7c4f3597-5d45-eb1e-c7e9-c3a4dfb9a240");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAMember1D.ctor(System.Int32,Objects.Geometry.Line,Objects.Structural.Properties.Property1D,Objects.Structural.Geometry.ElementType1D,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Restraint,Objects.Geometry.Vector,Objects.Geometry.Vector,Objects.Structural.GSA.Geometry.GSANode,System.Double)","Objects.Structural.GSA.Geometry.GSAMember1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAMember2DSchemaComponent: CreateSchemaObjectBase {
+    static GSAMember2DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAMember2DSchemaComponent(): base("GSAMember2D", "GSAMember2D", "Creates a Speckle structural 2D member for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("3b367574-1c20-77d0-c4e8-46979f8a3f42");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAMember2D.ctor(System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Properties.Property2D,Objects.Structural.Geometry.ElementType2D,System.Collections.Generic.List`1[System.Collections.Generic.List`1[Objects.Structural.Geometry.Node]],System.Double,System.Double)","Objects.Structural.GSA.Geometry.GSAMember2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSANodeSchemaComponent: CreateSchemaObjectBase {
+    static GSANodeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSANodeSchemaComponent(): base("GSANode", "GSANode", "Creates a Speckle structural node for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("3b6c01e9-4d99-90a8-357e-def8c043faa0");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSANode.ctor(System.Int32,Objects.Geometry.Point,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Axis,Objects.Structural.Properties.PropertySpring,Objects.Structural.Properties.PropertyMass,Objects.Structural.Properties.PropertyDamper,System.Double,System.String)","Objects.Structural.GSA.Geometry.GSANode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAPathSchemaComponent: CreateSchemaObjectBase {
+    static GSAPathSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAPathSchemaComponent(): base("GSAPath", "GSAPath", "Creates a Speckle structural path for GSA (a path defines traffic lines along a bridge relative to an alignments, for influence analysis)", "Speckle 2 GSA", "Bridge") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("f6c0f7f0-b742-f8ca-ebc4-0872bfd0517c");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAPath.ctor(System.Int32,System.String,Objects.Structural.GSA.Bridge.PathType,System.Int32,Objects.Structural.GSA.Bridge.GSAAlignment,System.Double,System.Double,System.Double,System.Int32)","Objects.Structural.GSA.Bridge.GSAPath");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAPolylineSchemaComponent: CreateSchemaObjectBase {
+    static GSAPolylineSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAPolylineSchemaComponent(): base("GSAPolyline", "GSAPolyline", "Creates a Speckle structural polyline for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("e1e8bcb7-7a12-79be-d15f-c2a2bc9ad6df");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Loading.GSAPolyline.ctor(System.String,System.Int32,System.Collections.Generic.IEnumerable`1[System.Double],System.String,Objects.Structural.GSA.Geometry.GSAGridPlane)","Objects.Structural.GSA.Loading.GSAPolyline");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAProperty1DSchemaComponent: CreateSchemaObjectBase {
+    static GSAProperty1DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAProperty1DSchemaComponent(): base("GSAProperty1D", "GSAProperty1D", "Creates a Speckle structural 1D element property for GSA", "Speckle 2 GSA", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("347df789-96b7-21f2-fc2f-5bfd26dfbe6f");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Properties.GSAProperty1D.ctor(System.Int32,System.String,Objects.Structural.Materials.StructuralMaterial,Objects.Structural.Properties.Profiles.SectionProfile,System.Double,System.Double)","Objects.Structural.GSA.Properties.GSAProperty1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAProperty2DSchemaComponent: CreateSchemaObjectBase {
+    static GSAProperty2DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAProperty2DSchemaComponent(): base("GSAProperty2D", "GSAProperty2D", "Creates a Speckle structural 2D element property for GSA", "Speckle 2 GSA", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("562e2664-bdf3-8b98-6e09-cc6584cf2146");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Properties.GSAProperty2D.ctor(System.Int32,System.String,Objects.Structural.Materials.StructuralMaterial,System.Double)","Objects.Structural.GSA.Properties.GSAProperty2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSARigidConstraintSchemaComponent: CreateSchemaObjectBase {
+    static GSARigidConstraintSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSARigidConstraintSchemaComponent(): base("GSARigidConstraint", "GSARigidConstraint", "Creates a Speckle structural rigid restraint (a set of nodes constrained to move as a rigid body) for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("fd5845ec-2b73-db4d-8c8f-01d9c7c7d0bb");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSARigidConstraint.ctor(System.String,System.Int32,Objects.Structural.Geometry.Node,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Speckle.Core.Models.Base,System.Collections.Generic.List`1[Objects.Structural.GSA.Analysis.GSAStage],Objects.Structural.GSA.Geometry.LinkageType,System.Collections.Generic.Dictionary`2[Objects.Structural.GSA.Geometry.AxisDirection6,System.Collections.Generic.List`1[Objects.Structural.GSA.Geometry.AxisDirection6]])","Objects.Structural.GSA.Geometry.GSARigidConstraint");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAStageSchemaComponent: CreateSchemaObjectBase {
+    static GSAStageSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAStageSchemaComponent(): base("GSAStage", "GSAStage", "Creates a Speckle structural analysis stage for GSA", "Speckle 2 GSA", "Analysis") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("0f7bf991-1225-1cea-5543-7dea926b1089");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Analysis.GSAStage.ctor(System.Int32,System.String,System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Double,System.Int32,System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.Structural.GSA.Analysis.GSAStage");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSASteelSchemaComponent: CreateSchemaObjectBase {
+    static GSASteelSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSASteelSchemaComponent(): base("Steel", "Steel", "Creates a Speckle structural material for steel (to be used in structural analysis models)", "Speckle 2 Structural", "Materials") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("073f9f26-2cfb-9f2d-fbcd-67ce9904872e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Materials.GSASteel.ctor(System.Int32,System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.String)","Objects.Structural.GSA.Materials.GSASteel");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAStoreySchemaComponent: CreateSchemaObjectBase {
+    static GSAStoreySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAStoreySchemaComponent(): base("GSAStorey", "GSAStorey", "Creates a Speckle structural storey (to describe floor levels/storeys in the structural model) for GSA", "Speckle 2 GSA", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("24bd70e1-024d-538c-8132-d02c4c101e5d");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Geometry.GSAStorey.ctor(System.Int32,System.String,Objects.Structural.Geometry.Axis,System.Double,System.Double,System.Double)","Objects.Structural.GSA.Geometry.GSAStorey");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSATaskSchemaComponent: CreateSchemaObjectBase {
+    static GSATaskSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSATaskSchemaComponent(): base("GSAAnalysisTask", "GSAAnalysisTask", "Creates a Speckle structural analysis task for GSA", "Speckle 2 GSA", "Analysis") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("958d20e6-b44e-1dbc-4df3-6dee9b9e13bb");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Analysis.GSATask.ctor(System.Int32,System.String)","Objects.Structural.GSA.Analysis.GSATask");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class GSAUserVehicleSchemaComponent: CreateSchemaObjectBase {
+    static GSAUserVehicleSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public GSAUserVehicleSchemaComponent(): base("GSAUserVehicle", "GSAUserVehicle", "Creates a Speckle structural user-defined vehicle (as a pattern of loading based on axle and wheel positions, for influence analysis) for GSA", "Speckle 2 GSA", "Bridge") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 GSA";
+
+    internal static Guid internalGuid => new Guid("891ecc6d-cf2a-a476-d94c-f31b51eff020");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.GSA.Bridge.GSAUserVehicle.ctor(System.Int32,System.String,System.Double,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double])","Objects.Structural.GSA.Bridge.GSAUserVehicle");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ISectionSchemaComponent: CreateSchemaObjectBase {
+    static ISectionSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ISectionSchemaComponent(): base("ISection", "ISection", "Creates a Speckle structural I section profile", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("321c4075-d631-8957-9daf-244e6374d73e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.ISection.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.ISection");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LevelSchemaComponent: CreateSchemaObjectBase {
+    static LevelSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LevelSchemaComponent(): base("Level", "Level", "Creates a Speckle level", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("04fca79a-ae5b-6ac4-581d-79438351a4e8");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Level.ctor(System.String,System.Double)","Objects.BuiltElements.Level");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadBeamSchemaComponent: CreateSchemaObjectBase {
+    static LoadBeamSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadBeamSchemaComponent(): base("Beam Load", "Beam Load", "Creates a Speckle structural beam (1D elem/member) load", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("5aa7c096-d596-e901-49cd-94df21f0f4c9");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadBeam.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.BeamLoadType,Objects.Structural.Loading.LoadDirection,Objects.Structural.LoadAxisType,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean,System.String)","Objects.Structural.Loading.LoadBeam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadBeam1SchemaComponent: CreateSchemaObjectBase {
+    static LoadBeam1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadBeam1SchemaComponent(): base("Beam Load (user-defined axis)", "Beam Load (user-defined axis)", "Creates a Speckle structural beam (1D elem/member) load (specified using a user-defined axis)", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("a84bb64f-5fdc-13b4-bd37-99fa6ee8260a");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadBeam.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.BeamLoadType,Objects.Structural.Loading.LoadDirection,Objects.Structural.Geometry.Axis,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean,System.String)","Objects.Structural.Loading.LoadBeam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadCaseSchemaComponent: CreateSchemaObjectBase {
+    static LoadCaseSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadCaseSchemaComponent(): base("Load Case", "Load Case", "Creates a Speckle structural load case", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("6436c6fd-e4e3-b78a-75f5-d967dc2550fc");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadCase.ctor(System.String,Objects.Structural.Loading.LoadType,System.String,Objects.Structural.Loading.ActionType,System.String)","Objects.Structural.Loading.LoadCase");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadCombinationSchemaComponent: CreateSchemaObjectBase {
+    static LoadCombinationSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadCombinationSchemaComponent(): base("Load Combination", "Load Combination", "Creates a Speckle load combination", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("fdbef7a9-adba-eeed-cb4f-9d9799e16da7");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadCombination.ctor(System.String,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[System.Double],Objects.Structural.Loading.CombinationType)","Objects.Structural.Loading.LoadCombination");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadFaceSchemaComponent: CreateSchemaObjectBase {
+    static LoadFaceSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadFaceSchemaComponent(): base("Face Load", "Face Load", "Creates a Speckle structural face (2D elem/member) load", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("9bc9c37f-a304-15dc-76ce-17fced07fa46");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadFace.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.FaceLoadType,Objects.Structural.Loading.LoadDirection2D,Objects.Structural.LoadAxisType,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean,System.String)","Objects.Structural.Loading.LoadFace");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadFace1SchemaComponent: CreateSchemaObjectBase {
+    static LoadFace1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadFace1SchemaComponent(): base("Face Load (user-defined axis)", "Face Load (user-defined axis)", "Creates a Speckle structural face (2D elem/member) load (specified using a user-defined axis)", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("ad3f7cf4-8c06-10ce-39a2-895ab8a9a475");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadFace.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Structural.Loading.FaceLoadType,Objects.Structural.Loading.LoadDirection2D,Objects.Structural.Geometry.Axis,System.Collections.Generic.List`1[System.Double],System.Collections.Generic.List`1[System.Double],System.Boolean,System.String)","Objects.Structural.Loading.LoadFace");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadGravitySchemaComponent: CreateSchemaObjectBase {
+    static LoadGravitySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadGravitySchemaComponent(): base("Gravity Load (all elements)", "Gravity Load (all elements)", "Creates a Speckle structural gravity load (applied to all nodes and elements)", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("f29ce365-1d94-af6d-cf2d-455043fba7a4");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadGravity.ctor(Objects.Structural.Loading.LoadCase,Objects.Geometry.Vector,System.String)","Objects.Structural.Loading.LoadGravity");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadGravity1SchemaComponent: CreateSchemaObjectBase {
+    static LoadGravity1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadGravity1SchemaComponent(): base("Gravity Load (specified elements)", "Gravity Load (specified elements)", "Creates a Speckle structural gravity load (applied to specified elements)", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("a916973a-2052-a4b5-9184-2e76e0059e65");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadGravity.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Vector,System.String)","Objects.Structural.Loading.LoadGravity");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadGravity2SchemaComponent: CreateSchemaObjectBase {
+    static LoadGravity2SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadGravity2SchemaComponent(): base("Gravity Load (specified elements and nodes)", "Gravity Load (specified elements and nodes)", "Creates a Speckle structural gravity load (applied to specified nodes and elements)", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("0a4e16ba-52e5-38d9-dce6-630e15528828");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadGravity.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],Objects.Geometry.Vector,System.String)","Objects.Structural.Loading.LoadGravity");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadNodeSchemaComponent: CreateSchemaObjectBase {
+    static LoadNodeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadNodeSchemaComponent(): base("Node Load", "Node Load", "Creates a Speckle node load", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("3d5a37ee-3ce8-8dc6-0efb-7c81bb9d4588");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadNode.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Loading.LoadDirection,System.Double,System.String)","Objects.Structural.Loading.LoadNode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class LoadNode1SchemaComponent: CreateSchemaObjectBase {
+    static LoadNode1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public LoadNode1SchemaComponent(): base("Node Load (user-defined axis)", "Node Load (user-defined axis)", "Creates a Speckle node load (specifed using a user-defined axis)", "Speckle 2 Structural", "Loading") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("cbbfa332-f0f7-0470-a9f7-7a81813075ad");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Loading.LoadNode.ctor(Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[Objects.Structural.Geometry.Node],Objects.Structural.Geometry.Axis,Objects.Structural.Loading.LoadDirection,System.Double,System.String)","Objects.Structural.Loading.LoadNode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class MaterialSchemaComponent: CreateSchemaObjectBase {
+    static MaterialSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public MaterialSchemaComponent(): base("RevitMaterial", "RevitMaterial", "Creates a Speckle material", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("a2ec94ca-c50c-01bf-3d12-0c8feb41004b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.Material.ctor(System.String)","Objects.Other.Material");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class MaterialQuantitySchemaComponent: CreateSchemaObjectBase {
+    static MaterialQuantitySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public MaterialQuantitySchemaComponent(): base("MaterialQuantity", "MaterialQuantity", "Creates the quantity of a material", "Speckle 2 BIM", "Objects.Other") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("c94a9777-99bb-d501-281a-c10300309038");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.MaterialQuantity.ctor(Objects.Other.Material,System.Double,System.Double,System.String)","Objects.Other.MaterialQuantity");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ModelSchemaComponent: CreateSchemaObjectBase {
+    static ModelSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ModelSchemaComponent(): base("Model", "Model", "Creates a Speckle structural model object", "Speckle 2 Structural", "Analysis") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("af7f27db-7897-fcad-1839-3b5213188ef8");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.Model.ctor(Objects.Structural.Analysis.ModelInfo,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.Structural.Analysis.Model");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ModelCurveSchemaComponent: CreateSchemaObjectBase {
+    static ModelCurveSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ModelCurveSchemaComponent(): base("ModelCurve", "ModelCurve", "Creates a Revit model curve", "Speckle 2 Revit", "Curves") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("7aa6e073-6783-8e7b-eec2-7b7bb0420db2");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Curve.ModelCurve.ctor(Objects.ICurve,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.Curve.ModelCurve");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ModelInfoSchemaComponent: CreateSchemaObjectBase {
+    static ModelInfoSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ModelInfoSchemaComponent(): base("ModelInfo", "ModelInfo", "Creates a Speckle object which describes basic model and project information for a structural model", "Speckle 2 Structural", "Analysis") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("f9da0acf-e2ee-8d25-662f-f5b9928ff8aa");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.ModelInfo.ctor(System.String,System.String,System.String,System.String,Objects.Structural.Analysis.ModelSettings,System.String,System.String)","Objects.Structural.Analysis.ModelInfo");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ModelSettingsSchemaComponent: CreateSchemaObjectBase {
+    static ModelSettingsSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ModelSettingsSchemaComponent(): base("ModelSettings", "ModelSettings", "Creates a Speckle object which describes design and analysis settings for the structural model", "Speckle 2 Structural", "Analysis") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("2f8c73cc-0692-3fd9-a825-7e0677164975");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.ModelSettings.ctor(Objects.Structural.Analysis.ModelUnits,System.String,System.String,System.Double)","Objects.Structural.Analysis.ModelSettings");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ModelUnitsSchemaComponent: CreateSchemaObjectBase {
+    static ModelUnitsSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ModelUnitsSchemaComponent(): base("ModelUnits", "ModelUnits", "Creates a Speckle object which specifies the units associated with the model", "Speckle 2 Structural", "Analysis") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("6c3340f9-3493-5e35-7272-e6acd0eefa85");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.ModelUnits.ctor(Objects.Structural.Analysis.UnitsType)","Objects.Structural.Analysis.ModelUnits");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ModelUnits1SchemaComponent: CreateSchemaObjectBase {
+    static ModelUnits1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ModelUnits1SchemaComponent(): base("ModelUnits (custom)", "ModelUnits (custom)", "Creates a Speckle object which specifies the units associated with the model", "Speckle 2 Structural", "Analysis") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("162c2a99-e4c9-314f-1833-f0e4a5c7451d");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.ModelUnits.ctor(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)","Objects.Structural.Analysis.ModelUnits");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class NodeSchemaComponent: CreateSchemaObjectBase {
+    static NodeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public NodeSchemaComponent(): base("Node with properties", "Node with properties", "Creates a Speckle structural node with spring, mass and/or damper properties", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("dacc1582-c084-4685-981a-6f8f8d8663c8");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Node.ctor(Objects.Geometry.Point,System.String,Objects.Structural.Geometry.Restraint,Objects.Structural.Geometry.Axis,Objects.Structural.Properties.PropertySpring,Objects.Structural.Properties.PropertyMass,Objects.Structural.Properties.PropertyDamper)","Objects.Structural.Geometry.Node");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class OpeningSchemaComponent: CreateSchemaObjectBase {
+    static OpeningSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public OpeningSchemaComponent(): base("Arch Opening", "Arch Opening", "Creates a Speckle opening", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("087f847f-6f51-3cc9-5b7d-2cce478b46f4");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Opening.ctor(Objects.ICurve)","Objects.BuiltElements.Opening");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ParameterSchemaComponent: CreateSchemaObjectBase {
+    static ParameterSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ParameterSchemaComponent(): base("Parameter", "Parameter", "A Revit instance parameter to set on an element", "Speckle 2 Revit", "Families") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("706f3fe9-f499-b07f-b682-febedbe38c9c");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Parameter.ctor(System.String,System.Object,System.String)","Objects.BuiltElements.Revit.Parameter");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ParameterUpdaterSchemaComponent: CreateSchemaObjectBase {
+    static ParameterUpdaterSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ParameterUpdaterSchemaComponent(): base("ParameterUpdater", "ParameterUpdater", "Updates parameters on a Revit element by id", "Speckle 2 Revit", "Families") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("c4f5fc69-58e1-59f6-4dac-e31b738f7254");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.ParameterUpdater.ctor(System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.ParameterUpdater");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PerimeterSchemaComponent: CreateSchemaObjectBase {
+    static PerimeterSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PerimeterSchemaComponent(): base("Perimeter", "Perimeter", "Creates a Speckle structural section profile defined by a perimeter curve and, if applicable, a list of void curves", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("63b41dcc-8f2e-b900-be8a-82a661e56f19");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Perimeter.ctor(System.String,Objects.ICurve,System.Collections.Generic.List`1[Objects.ICurve])","Objects.Structural.Properties.Profiles.Perimeter");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PipeSchemaComponent: CreateSchemaObjectBase {
+    static PipeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PipeSchemaComponent(): base("Pipe", "Pipe", "Creates a Speckle pipe", "Speckle 2 BIM", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("6892cf99-6913-7004-27ab-2cfb8435a644");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Pipe.ctor(Objects.ICurve,System.Double,System.Double,System.Double,System.Double)","Objects.BuiltElements.Pipe");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PropertySchemaComponent: CreateSchemaObjectBase {
+    static PropertySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PropertySchemaComponent(): base("Property", "Property", "Creates a Speckle structural property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("8f7a7ef0-dbe1-4085-a1e8-f602612698a5");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property.ctor(System.String)","Objects.Structural.Properties.Property");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Property1DSchemaComponent: CreateSchemaObjectBase {
+    static Property1DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Property1DSchemaComponent(): base("Property1D (by name)", "Property1D (by name)", "Creates a Speckle structural 1D element property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("fa29bbb6-ab8f-a235-67da-c10fe9daa077");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property1D.ctor(System.String)","Objects.Structural.Properties.Property1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Property1D1SchemaComponent: CreateSchemaObjectBase {
+    static Property1D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Property1D1SchemaComponent(): base("Property1D", "Property1D", "Creates a Speckle structural 1D element property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("301fb47d-9a12-ed72-4dbf-55d23ac5c432");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property1D.ctor(System.String,Objects.Structural.Materials.StructuralMaterial,Objects.Structural.Properties.Profiles.SectionProfile)","Objects.Structural.Properties.Property1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Property2DSchemaComponent: CreateSchemaObjectBase {
+    static Property2DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Property2DSchemaComponent(): base("Property2D (by name)", "Property2D (by name)", "Creates a Speckle structural 2D element property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("b637985b-c4b8-0bbd-109b-7caf9fea829f");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property2D.ctor(System.String)","Objects.Structural.Properties.Property2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Property2D1SchemaComponent: CreateSchemaObjectBase {
+    static Property2D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Property2D1SchemaComponent(): base("Property2D", "Property2D", "Creates a Speckle structural 2D element property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("a1f72576-5106-26da-625e-6c5dfe798b4f");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property2D.ctor(System.String,Objects.Structural.Materials.StructuralMaterial,Objects.Structural.PropertyType2D,System.Double)","Objects.Structural.Properties.Property2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Property3DSchemaComponent: CreateSchemaObjectBase {
+    static Property3DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Property3DSchemaComponent(): base("Property3D (by name)", "Property3D (by name)", "Creates a Speckle structural 3D element property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("a1644434-1c43-113c-786e-c1942f56d205");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property3D.ctor(System.String)","Objects.Structural.Properties.Property3D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Property3D1SchemaComponent: CreateSchemaObjectBase {
+    static Property3D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Property3D1SchemaComponent(): base("Property3D", "Property3D", "Creates a Speckle structural 3D element property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("5cc8c1d0-c3a7-0c95-f2b6-f8f7b4afdc95");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Property3D.ctor(System.String,Objects.Structural.PropertyType3D,Objects.Structural.Materials.StructuralMaterial)","Objects.Structural.Properties.Property3D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PropertyDamperSchemaComponent: CreateSchemaObjectBase {
+    static PropertyDamperSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PropertyDamperSchemaComponent(): base("PropertyDamper", "PropertyDamper", "Creates a Speckle structural damper property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("3d966901-7bcc-b5d0-c5c9-060ae5a2caff");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertyDamper.ctor(System.String)","Objects.Structural.Properties.PropertyDamper");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PropertyDamper1SchemaComponent: CreateSchemaObjectBase {
+    static PropertyDamper1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PropertyDamper1SchemaComponent(): base("PropertyDamper (general)", "PropertyDamper (general)", "Creates a Speckle structural damper property (for 6 degrees of freedom)", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("10534d96-587f-e36f-3a97-db6b3fae6b53");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertyDamper.ctor(System.String,Objects.Structural.PropertyTypeDamper,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.PropertyDamper");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PropertyMassSchemaComponent: CreateSchemaObjectBase {
+    static PropertyMassSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PropertyMassSchemaComponent(): base("PropertyMass", "PropertyMass", "Creates a Speckle structural mass property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("2ab5d65b-d4d7-85fa-01bf-2384c5ce5666");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertyMass.ctor(System.String)","Objects.Structural.Properties.PropertyMass");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PropertyMass1SchemaComponent: CreateSchemaObjectBase {
+    static PropertyMass1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PropertyMass1SchemaComponent(): base("PropertyMass (general)", "PropertyMass (general)", "Creates a Speckle structural mass property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("66fb8c7a-804c-06d2-a6e0-5da60241dc48");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertyMass.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Boolean,System.Double,System.Double,System.Double)","Objects.Structural.Properties.PropertyMass");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PropertySpringSchemaComponent: CreateSchemaObjectBase {
+    static PropertySpringSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PropertySpringSchemaComponent(): base("PropertySpring", "PropertySpring", "Creates a Speckle structural spring property", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("c83d3807-3ee9-9eb6-d6d3-ae472e5fce01");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertySpring.ctor(System.String)","Objects.Structural.Properties.PropertySpring");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PropertySpring1SchemaComponent: CreateSchemaObjectBase {
+    static PropertySpring1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PropertySpring1SchemaComponent(): base("PropertySpring (linear/elastic)", "PropertySpring (linear/elastic)", "Creates a Speckle structural spring property (linear/elastic spring)", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("03b67483-b251-b9f3-900a-e70c331314bb");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertySpring.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.PropertySpring");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class PropertySpring2SchemaComponent: CreateSchemaObjectBase {
+    static PropertySpring2SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public PropertySpring2SchemaComponent(): base("PropertySpring (non-linear)", "PropertySpring (non-linear)", "Creates a Speckle structural spring property (non-linear spring)", "Speckle 2 Structural", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("761c5a65-bec6-b6fb-1df5-c49cc427631b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.PropertySpring.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.PropertySpring");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RectangularSchemaComponent: CreateSchemaObjectBase {
+    static RectangularSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RectangularSchemaComponent(): base("Rectangular", "Rectangular", "Creates a Speckle structural rectangular section profile", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("2f4dce06-42d9-fe1e-5096-24debfd2fd4b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Rectangular.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Rectangular");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RenderMaterialSchemaComponent: CreateSchemaObjectBase {
+    static RenderMaterialSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RenderMaterialSchemaComponent(): base("RenderMaterial", "RenderMaterial", "Creates a render material.", "Speckle 2 BIM", "Other") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("03a49484-4eba-6e08-5e96-b3b78ed13f70");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.RenderMaterial.ctor(System.Double,System.Double,System.Double,System.Nullable`1[System.Drawing.Color],System.Nullable`1[System.Drawing.Color])","Objects.Other.RenderMaterial");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RestraintSchemaComponent: CreateSchemaObjectBase {
+    static RestraintSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RestraintSchemaComponent(): base("Restraint (by code)", "Restraint (by code)", "Creates a Speckle restraint object", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("4a117edf-50f0-9c11-6a80-e9692f15771b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Restraint.ctor(System.String)","Objects.Structural.Geometry.Restraint");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Restraint1SchemaComponent: CreateSchemaObjectBase {
+    static Restraint1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Restraint1SchemaComponent(): base("Restraint (by code and stiffness)", "Restraint (by code and stiffness)", "Creates a Speckle restraint object (to describe support conditions with an explicit stiffness)", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("a57df1f7-6fbd-4c84-a9d6-bd2d84f73811");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Restraint.ctor(System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Geometry.Restraint");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Restraint2SchemaComponent: CreateSchemaObjectBase {
+    static Restraint2SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Restraint2SchemaComponent(): base("Restraint (by enum)", "Restraint (by enum)", "Creates a Speckle restraint object (for pinned condition or fixed condition)", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("f85b9d32-e383-56a2-e6fa-1da0d28febe9");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Restraint.ctor(Objects.Structural.Geometry.RestraintType)","Objects.Structural.Geometry.Restraint");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Result1DSchemaComponent: CreateSchemaObjectBase {
+    static Result1DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Result1DSchemaComponent(): base("Result1D (load case)", "Result1D (load case)", "Creates a Speckle 1D element result object (for load case)", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("62b6e9c3-13b6-9dbd-b222-a0b6a978750e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result1D.ctor(Objects.Structural.Geometry.Element1D,Objects.Structural.Loading.LoadCase,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Result1D1SchemaComponent: CreateSchemaObjectBase {
+    static Result1D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Result1D1SchemaComponent(): base("Result1D (load combination)", "Result1D (load combination)", "Creates a Speckle 1D element result object (for load combination)", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("1151871b-42cc-e3f5-5e08-454f9733ef08");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result1D.ctor(Objects.Structural.Geometry.Element1D,Objects.Structural.Loading.LoadCombination,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Result2DSchemaComponent: CreateSchemaObjectBase {
+    static Result2DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Result2DSchemaComponent(): base("Result2D (load case)", "Result2D (load case)", "Creates a Speckle 2D element result object (for load case)", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("4d551fc5-fc7b-b2b8-5bba-63e48aeee645");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result2D.ctor(Objects.Structural.Geometry.Element2D,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[System.Double],System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Result2D1SchemaComponent: CreateSchemaObjectBase {
+    static Result2D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Result2D1SchemaComponent(): base("Result2D (load combination)", "Result2D (load combination)", "Creates a Speckle 2D element result object (for load combination)", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("29194017-21da-96ee-56c4-273cc84ff951");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result2D.ctor(Objects.Structural.Geometry.Element2D,Objects.Structural.Loading.LoadCombination,System.Collections.Generic.List`1[System.Double],System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Result3DSchemaComponent: CreateSchemaObjectBase {
+    static Result3DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Result3DSchemaComponent(): base("Result3D (load case)", "Result3D (load case)", "Creates a Speckle 3D element result object (for load case)", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("3a15c6fa-36cd-1da9-e410-928a62b940a8");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result3D.ctor(Objects.Structural.Geometry.Element3D,Objects.Structural.Loading.LoadCase,System.Collections.Generic.List`1[System.Double],System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result3D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Result3D1SchemaComponent: CreateSchemaObjectBase {
+    static Result3D1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Result3D1SchemaComponent(): base("Result3D (load combination)", "Result3D (load combination)", "Creates a Speckle 3D element result object (for load combination)", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("1aa4dd1e-d845-7760-0e58-a3744255f0a1");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.Result3D.ctor(Objects.Structural.Geometry.Element3D,Objects.Structural.Loading.LoadCombination,System.Collections.Generic.List`1[System.Double],System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.Result3D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultGlobalSchemaComponent: CreateSchemaObjectBase {
+    static ResultGlobalSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultGlobalSchemaComponent(): base("ResultGlobal (load case)", "ResultGlobal (load case)", "Creates a Speckle global result object (for load case)", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("6e742681-a159-d811-8d7c-4ac42682872f");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultGlobal.ctor(Objects.Structural.Loading.LoadCase,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.ResultGlobal");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultGlobal1SchemaComponent: CreateSchemaObjectBase {
+    static ResultGlobal1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultGlobal1SchemaComponent(): base("ResultGlobal (load combination)", "ResultGlobal (load combination)", "Creates a Speckle global result object (for load combination)", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("cd0af8ae-e8d9-b1d9-fce1-63d137a8f69c");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultGlobal.ctor(Objects.Structural.Loading.LoadCombination,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.ResultGlobal");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultNodeSchemaComponent: CreateSchemaObjectBase {
+    static ResultNodeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultNodeSchemaComponent(): base("ResultNode (load case)", "ResultNode (load case)", "Creates a Speckle structural nodal result object", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("5bf05a45-f397-00ae-0cf5-d89191042d21");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultNode.ctor(Objects.Structural.Loading.LoadCase,Objects.Structural.Geometry.Node,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.ResultNode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultNode1SchemaComponent: CreateSchemaObjectBase {
+    static ResultNode1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultNode1SchemaComponent(): base("ResultNode (load combination)", "ResultNode (load combination)", "Creates a Speckle structural nodal result object", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("c219b902-4ffd-8d03-7de0-2264c8ad6030");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultNode.ctor(Objects.Structural.Loading.LoadCombination,Objects.Structural.Geometry.Node,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)","Objects.Structural.Results.ResultNode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultSet1DSchemaComponent: CreateSchemaObjectBase {
+    static ResultSet1DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultSet1DSchemaComponent(): base("ResultSet1D", "ResultSet1D", "Creates a Speckle 1D element result set object", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("7928905d-5fad-53c8-8d44-0eec0c5478ba");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSet1D.ctor(System.Collections.Generic.List`1[Objects.Structural.Results.Result1D])","Objects.Structural.Results.ResultSet1D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultSet2DSchemaComponent: CreateSchemaObjectBase {
+    static ResultSet2DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultSet2DSchemaComponent(): base("ResultSet2D", "ResultSet2D", "Creates a Speckle 2D element result set object", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("ff5bdc35-b72a-a0be-066f-5ad08fbb047d");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSet2D.ctor(System.Collections.Generic.List`1[Objects.Structural.Results.Result2D])","Objects.Structural.Results.ResultSet2D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultSet3DSchemaComponent: CreateSchemaObjectBase {
+    static ResultSet3DSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultSet3DSchemaComponent(): base("ResultSet3D", "ResultSet3D", "Creates a Speckle 3D element result set object", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("7cde5263-7dd0-a1f7-535b-e9856769bc39");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSet3D.ctor(System.Collections.Generic.List`1[Objects.Structural.Results.Result3D])","Objects.Structural.Results.ResultSet3D");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultSetAllSchemaComponent: CreateSchemaObjectBase {
+    static ResultSetAllSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultSetAllSchemaComponent(): base("ResultSetAll", "ResultSetAll", "Creates a Speckle result set object for 1d element, 2d element, 3d element global and nodal results", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("440aefda-79ff-55f5-4571-1a7ef57239e8");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSetAll.ctor(Objects.Structural.Results.ResultSet1D,Objects.Structural.Results.ResultSet2D,Objects.Structural.Results.ResultSet3D,Objects.Structural.Results.ResultGlobal,Objects.Structural.Results.ResultSetNode)","Objects.Structural.Results.ResultSetAll");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class ResultSetNodeSchemaComponent: CreateSchemaObjectBase {
+    static ResultSetNodeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public ResultSetNodeSchemaComponent(): base("ResultSetNode", "ResultSetNode", "Creates a Speckle node result set object", "Speckle 2 Structural", "Results") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("07d3aa5f-55e8-f0c6-96da-d9599a8da233");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSetNode.ctor(System.Collections.Generic.List`1[Objects.Structural.Results.ResultNode])","Objects.Structural.Results.ResultSetNode");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitBeamSchemaComponent: CreateSchemaObjectBase {
+    static RevitBeamSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitBeamSchemaComponent(): base("RevitBeam", "RevitBeam", "Creates a Revit beam by curve and base level.", "Speckle 2 Revit", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("6aba19f5-1b1c-8e0c-f063-2a7c91816b1c");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitBeam.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitBeam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitBraceSchemaComponent: CreateSchemaObjectBase {
+    static RevitBraceSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitBraceSchemaComponent(): base("RevitBrace", "RevitBrace", "Creates a Revit brace by curve and base level.", "Speckle 2 Revit", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("a3a689dc-2ca5-d5be-a225-99a144768e7e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitBrace.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitBrace");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitCeilingSchemaComponent: CreateSchemaObjectBase {
+    static RevitCeilingSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitCeilingSchemaComponent(): base("RevitCeiling", "RevitCeiling", "Creates a Revit ceiling", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("93e6568e-0dc2-ebd2-64b0-e202eabe49cb");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitCeiling.ctor(Objects.ICurve,System.String,System.String,Objects.BuiltElements.Level,System.Double,Objects.Geometry.Line,System.Double,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Revit.RevitCeiling");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitColumnSchemaComponent: CreateSchemaObjectBase {
+    static RevitColumnSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitColumnSchemaComponent(): base("RevitColumn Vertical", "RevitColumn Vertical", "Creates a vertical Revit Column by point and levels.", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("c243fe91-0103-bea1-34b7-3e8b39c8d0ec");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitColumn.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Double,System.Double,System.Boolean,System.Double,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitColumn");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitColumn1SchemaComponent: CreateSchemaObjectBase {
+    static RevitColumn1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitColumn1SchemaComponent(): base("RevitColumn Slanted (old)", "RevitColumn Slanted (old)", "Creates a slanted Revit Column by curve.", "Speckle 2 Revit", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("bd9936e6-c75f-c0de-feb0-b801eff0e0ea");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override bool Obsolete => true;
+    public override GH_Exposure Exposure => GH_Exposure.hidden;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitColumn.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitColumn");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitColumn2SchemaComponent: CreateSchemaObjectBase {
+    static RevitColumn2SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitColumn2SchemaComponent(): base("RevitColumn Slanted", "RevitColumn Slanted", "Creates a slanted Revit Column by curve.", "Speckle 2 Revit", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("1600415c-b327-870c-7cd4-bb9c1b1a82fc");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitColumn.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitColumn");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitDuctSchemaComponent: CreateSchemaObjectBase {
+    static RevitDuctSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitDuctSchemaComponent(): base("RevitDuct", "RevitDuct", "Creates a Revit duct", "Speckle 2 Revit", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("d7781536-e8a9-8aef-1b27-571584f8c4a3");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override bool Obsolete => true;
+    public override GH_Exposure Exposure => GH_Exposure.hidden;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitDuct.ctor(System.String,System.String,Objects.Geometry.Line,System.String,System.String,Objects.BuiltElements.Level,System.Double,System.Double,System.Double,System.Double,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitDuct");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitDuct1SchemaComponent: CreateSchemaObjectBase {
+    static RevitDuct1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitDuct1SchemaComponent(): base("RevitDuct", "RevitDuct", "Creates a Revit duct", "Speckle 2 Revit", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("7bb86598-9cd2-8d29-a1dc-7500c4b4ed4b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitDuct.ctor(System.String,System.String,Objects.ICurve,System.String,System.String,Objects.BuiltElements.Level,System.Double,System.Double,System.Double,System.Double,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitDuct");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitExtrusionRoofSchemaComponent: CreateSchemaObjectBase {
+    static RevitExtrusionRoofSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitExtrusionRoofSchemaComponent(): base("RevitExtrusionRoof", "RevitExtrusionRoof", "Creates a Revit roof by extruding a curve", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("707428ab-15b4-e7ec-a2cd-21154ff50c1b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitRoof.RevitExtrusionRoof.ctor(System.String,System.String,System.Double,System.Double,Objects.Geometry.Line,Objects.BuiltElements.Level,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitRoof.RevitExtrusionRoof");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitFaceWallSchemaComponent: CreateSchemaObjectBase {
+    static RevitFaceWallSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitFaceWallSchemaComponent(): base("RevitWall by face", "RevitWall by face", "Creates a Revit wall from a surface.", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("fc3927a7-0877-8137-a34e-ecd19a6f688c");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitFaceWall.ctor(System.String,System.String,Objects.Geometry.Brep,Objects.BuiltElements.Level,Objects.BuiltElements.Revit.LocationLine,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitFaceWall");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitFlexDuctSchemaComponent: CreateSchemaObjectBase {
+    static RevitFlexDuctSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitFlexDuctSchemaComponent(): base("RevitFlexDuct", "RevitFlexDuct", "Creates a Revit flex duct", "Speckle 2 Revit", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("f350f9a2-06ca-6118-a4e6-88e721bb7f52");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitFlexDuct.ctor(System.String,System.String,Objects.ICurve,System.String,System.String,Objects.BuiltElements.Level,System.Double,System.Double,System.Double,Objects.Geometry.Vector,Objects.Geometry.Vector,System.Double,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitFlexDuct");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitFlexPipeSchemaComponent: CreateSchemaObjectBase {
+    static RevitFlexPipeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitFlexPipeSchemaComponent(): base("RevitFlexPipe", "RevitFlexPipe", "Creates a Revit flex pipe", "Speckle 2 Revit", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("219bfacc-9c41-441a-210c-c2cfb877929b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitFlexPipe.ctor(System.String,System.String,Objects.ICurve,System.Double,Objects.BuiltElements.Level,Objects.Geometry.Vector,Objects.Geometry.Vector,System.String,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitFlexPipe");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitFloorSchemaComponent: CreateSchemaObjectBase {
+    static RevitFloorSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitFloorSchemaComponent(): base("RevitFloor", "RevitFloor", "Creates a Revit floor by outline and level", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("e6f17d4f-6c28-0d0f-2370-7b9c09a14fff");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitFloor.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Boolean,System.Double,Objects.Geometry.Line,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitFloor");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitFootprintRoofSchemaComponent: CreateSchemaObjectBase {
+    static RevitFootprintRoofSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitFootprintRoofSchemaComponent(): base("RevitFootprintRoof", "RevitFootprintRoof", "Creates a Revit roof by outline", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("b2f55d9f-7242-ee7e-c44a-24e34d5f6e3e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitRoof.RevitFootprintRoof.ctor(Objects.ICurve,System.String,System.String,Objects.BuiltElements.Level,Objects.BuiltElements.Revit.RevitLevel,System.Double,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitRoof.RevitFootprintRoof");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitLevelSchemaComponent: CreateSchemaObjectBase {
+    static RevitLevelSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitLevelSchemaComponent(): base("RevitLevel", "RevitLevel", "Creates a new Revit level unless one with the same elevation already exists", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("5ef6e45c-00bd-f3b9-1cbf-6e9a902da7ab");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitLevel.ctor(System.String,System.Double,System.Boolean,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitLevel");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitLevel1SchemaComponent: CreateSchemaObjectBase {
+    static RevitLevel1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitLevel1SchemaComponent(): base("RevitLevel by name", "RevitLevel by name", "Gets an existing Revit level by name", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("e075a88e-7867-3726-3bb7-15b73b2d17e6");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitLevel.ctor(System.String)","Objects.BuiltElements.Revit.RevitLevel");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitMaterialSchemaComponent: CreateSchemaObjectBase {
+    static RevitMaterialSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitMaterialSchemaComponent(): base("RevitMaterial", "RevitMaterial", "Creates a Speckle material", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("c291d027-7a6a-8950-a2aa-77e134675750");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Other.Revit.RevitMaterial.ctor(System.String,System.String,System.String,System.Int32,System.Int32,System.Int32,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.Other.Revit.RevitMaterial");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitPipeSchemaComponent: CreateSchemaObjectBase {
+    static RevitPipeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitPipeSchemaComponent(): base("RevitPipe", "RevitPipe", "Creates a Revit pipe", "Speckle 2 Revit", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("19700cd2-6310-c8b3-7ad5-954033702e52");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitPipe.ctor(System.String,System.String,Objects.ICurve,System.Double,Objects.BuiltElements.Level,System.String,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitPipe");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitProfileWallSchemaComponent: CreateSchemaObjectBase {
+    static RevitProfileWallSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitProfileWallSchemaComponent(): base("RevitWall by profile", "RevitWall by profile", "Creates a Revit wall from a profile.", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("b3962fc0-69b0-e766-22b4-b08404650c8a");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitProfileWall.ctor(System.String,System.String,Objects.Geometry.Polycurve,Objects.BuiltElements.Level,Objects.BuiltElements.Revit.LocationLine,System.Boolean,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitProfileWall");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitRailingSchemaComponent: CreateSchemaObjectBase {
+    static RevitRailingSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitRailingSchemaComponent(): base("Railing", "Railing", "Creates a Revit railing by base curve.", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("a6c3be7a-9e6b-663b-2bc0-dd9fa2ee6552");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitRailing.ctor(System.String,Objects.Geometry.Polycurve,Objects.BuiltElements.Level,System.Boolean)","Objects.BuiltElements.Revit.RevitRailing");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitShaftSchemaComponent: CreateSchemaObjectBase {
+    static RevitShaftSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitShaftSchemaComponent(): base("RevitShaft", "RevitShaft", "Creates a Revit shaft from a bottom and top level", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("00cdb2fd-ef75-107e-822c-3490cd359380");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitShaft.ctor(Objects.ICurve,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitShaft");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitTopographySchemaComponent: CreateSchemaObjectBase {
+    static RevitTopographySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitTopographySchemaComponent(): base("RevitTopography", "RevitTopography", "Creates a Revit topography", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("f0840908-039e-b6d4-98de-8ed003dfd357");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitTopography.ctor(Objects.Geometry.Mesh,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitTopography");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitWallSchemaComponent: CreateSchemaObjectBase {
+    static RevitWallSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitWallSchemaComponent(): base("RevitWall by curve and levels", "RevitWall by curve and levels", "Creates a Revit wall with a top and base level.", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("fa1aef22-ddd5-01f4-887e-145ce21da247");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWall.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Double,System.Double,System.Boolean,System.Boolean,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitWall");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitWall1SchemaComponent: CreateSchemaObjectBase {
+    static RevitWall1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitWall1SchemaComponent(): base("RevitWall by curve and height", "RevitWall by curve and height", "Creates an unconnected Revit wall.", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("bd2a0bb1-14f7-cd0a-76c4-2429412a5128");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWall.ctor(System.String,System.String,Objects.ICurve,Objects.BuiltElements.Level,System.Double,System.Double,System.Double,System.Boolean,System.Boolean,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitWall");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitWallOpeningSchemaComponent: CreateSchemaObjectBase {
+    static RevitWallOpeningSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitWallOpeningSchemaComponent(): base("Revit Wall Opening (Deprecated)", "Revit Wall Opening (Deprecated)", "Creates a Speckle Wall opening for revit", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("a1bd278d-fab5-0034-7aba-807b66122022");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override bool Obsolete => true;
+    public override GH_Exposure Exposure => GH_Exposure.hidden;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWallOpening.ctor(Objects.ICurve,Objects.BuiltElements.Revit.RevitWall)","Objects.BuiltElements.Revit.RevitWallOpening");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitWallOpening1SchemaComponent: CreateSchemaObjectBase {
+    static RevitWallOpening1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitWallOpening1SchemaComponent(): base("Revit Wall Opening", "Revit Wall Opening", "Creates a Speckle Wall opening for revit", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("541bfed0-738d-e1bd-1130-de05ec4bbf9e");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWallOpening.ctor(Objects.Geometry.Polyline,Objects.BuiltElements.Revit.RevitWall)","Objects.BuiltElements.Revit.RevitWallOpening");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RevitWireSchemaComponent: CreateSchemaObjectBase {
+    static RevitWireSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RevitWireSchemaComponent(): base("RevitWire", "RevitWire", "Creates a Revit wire from points and level", "Speckle 2 Revit", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("4045436b-0804-f0e1-a9f2-6217f4d8a45b");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.RevitWire.ctor(System.Collections.Generic.List`1[System.Double],System.String,System.String,Objects.BuiltElements.Level,System.String,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.RevitWire");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RibbedSlabSchemaComponent: CreateSchemaObjectBase {
+    static RibbedSlabSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RibbedSlabSchemaComponent(): base("RibbedSlab", "RibbedSlab", "Create an CSI Ribbed Slab", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("e5db5889-0924-136f-be6d-39c7de9a3649");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+RibbedSlab.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double,System.Int32)","Objects.Structural.CSI.Properties.CSIProperty2D+RibbedSlab");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RoofSchemaComponent: CreateSchemaObjectBase {
+    static RoofSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RoofSchemaComponent(): base("Roof", "Roof", "Creates a Speckle roof", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("c10c6dcd-e6a8-be88-32f3-45c935d0bae9");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override bool Obsolete => true;
+    public override GH_Exposure Exposure => GH_Exposure.hidden;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Roof.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.ICurve],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Roof");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RoomSchemaComponent: CreateSchemaObjectBase {
+    static RoomSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RoomSchemaComponent(): base("Room", "Room", "Creates a Speckle room", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("c62087b7-2a9d-743d-336d-e8ea2ab72a29");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Room.ctor(System.String,System.String,Objects.BuiltElements.Level,Objects.Geometry.Point)","Objects.BuiltElements.Room");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Room1SchemaComponent: CreateSchemaObjectBase {
+    static Room1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Room1SchemaComponent(): base("RevitRoom", "RevitRoom", "Creates a Revit room with parameters", "Speckle 2 Revit", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("9be891e2-aaf6-1d4e-3d6b-bd7ba1a06563");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Room.ctor(System.String,System.String,Objects.BuiltElements.Level,Objects.Geometry.Point,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Room");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class RoomBoundaryLineSchemaComponent: CreateSchemaObjectBase {
+    static RoomBoundaryLineSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public RoomBoundaryLineSchemaComponent(): base("RoomBoundaryLine", "RoomBoundaryLine", "Creates a Revit room boundary line", "Speckle 2 Revit", "Curves") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("2edade8a-5139-09be-4273-551f3ac476e2");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Curve.RoomBoundaryLine.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.Curve.RoomBoundaryLine");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class SlabSchemaComponent: CreateSchemaObjectBase {
+    static SlabSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public SlabSchemaComponent(): base("Slab", "Slab", "Create an CSI Slab", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("27930f28-6811-7f66-f432-07dd5585f6e0");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+Slab.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+Slab");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class SpaceSchemaComponent: CreateSchemaObjectBase {
+    static SpaceSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public SpaceSchemaComponent(): base("Space", "Space", "Creates a Speckle space", "Speckle 2 BIM", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("c6907933-2792-eb6d-7c64-fb54835e9b44");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Space.ctor(System.String,System.String,Objects.Geometry.Point,Objects.BuiltElements.Level)","Objects.BuiltElements.Space");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class Space1SchemaComponent: CreateSchemaObjectBase {
+    static Space1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public Space1SchemaComponent(): base("Space with top level and offset parameters", "Space with top level and offset parameters", "Creates a Speckle space with the specified top level and offsets", "Speckle 2 BIM", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("8f7b0323-3533-e7cd-ae43-0bdeb34f3570");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Space.ctor(System.String,System.String,Objects.Geometry.Point,Objects.BuiltElements.Level,Objects.BuiltElements.Level,System.Double,System.Double)","Objects.BuiltElements.Space");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class SpaceSeparationLineSchemaComponent: CreateSchemaObjectBase {
+    static SpaceSeparationLineSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public SpaceSeparationLineSchemaComponent(): base("SpaceSeparationLine", "SpaceSeparationLine", "Creates a Revit space separation line", "Speckle 2 Revit", "Curves") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Revit";
+
+    internal static Guid internalGuid => new Guid("0bba13ce-5758-8513-42fd-9e0b3702a654");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Revit.Curve.SpaceSeparationLine.ctor(Objects.ICurve,System.Collections.Generic.List`1[Objects.BuiltElements.Revit.Parameter])","Objects.BuiltElements.Revit.Curve.SpaceSeparationLine");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class SteelSchemaComponent: CreateSchemaObjectBase {
+    static SteelSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public SteelSchemaComponent(): base("Steel", "Steel", "Creates a Speckle structural material for steel (to be used in structural analysis models)", "Speckle 2 Structural", "Materials") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("6756df31-1e5c-0c80-2047-f4b6557c2e3f");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.Steel.ctor(System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Materials.Steel");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class StoreySchemaComponent: CreateSchemaObjectBase {
+    static StoreySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public StoreySchemaComponent(): base("Storey", "Storey", "Creates a Speckle structural storey (to describe floor levels/storeys in the structural model)", "Speckle 2 Structural", "Geometry") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("a3985ed4-fff8-47c1-bb0e-d63699e263e9");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Geometry.Storey.ctor(System.String,System.Double)","Objects.Structural.Geometry.Storey");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class StructuralMaterialSchemaComponent: CreateSchemaObjectBase {
+    static StructuralMaterialSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public StructuralMaterialSchemaComponent(): base("Structural Material", "Structural Material", "Creates a Speckle structural material", "Speckle 2 Structural", "Materials") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("3e877a75-b3fb-0111-2128-1432ab15c4cf");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.StructuralMaterial.ctor(System.String,Objects.Structural.MaterialType,System.String,System.String,System.String)","Objects.Structural.Materials.StructuralMaterial");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class StructuralMaterial1SchemaComponent: CreateSchemaObjectBase {
+    static StructuralMaterial1SchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public StructuralMaterial1SchemaComponent(): base("Structural Material (with properties)", "Structural Material (with properties)", "Creates a Speckle structural material with (isotropic) properties", "Speckle 2 Structural", "Materials") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("ef78155b-0786-9846-38cd-41ce70911972");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.StructuralMaterial.ctor(System.String,Objects.Structural.MaterialType,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Materials.StructuralMaterial");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class TeeSchemaComponent: CreateSchemaObjectBase {
+    static TeeSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public TeeSchemaComponent(): base("Tee", "Tee", "Creates a Speckle structural Tee section profile", "Speckle 2 Structural", "Section Profile") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("7832cac3-92e9-9083-df97-0d4296b457c3");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Properties.Profiles.Tee.ctor(System.String,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Properties.Profiles.Tee");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class TeklaBeamSchemaComponent: CreateSchemaObjectBase {
+    static TeklaBeamSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public TeklaBeamSchemaComponent(): base("TeklaBeam", "TeklaBeam", "Creates a Tekla Structures beam by curve.", "Speckle 2 Tekla", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Tekla";
+
+    internal static Guid internalGuid => new Guid("5a4187bc-05d8-2447-7238-cdbc4b2fae45");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.TeklaStructures.TeklaBeam.ctor(Objects.ICurve,Objects.Structural.Properties.Profiles.SectionProfile,Objects.Structural.Materials.StructuralMaterial)","Objects.BuiltElements.TeklaStructures.TeklaBeam");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class TeklaContourPlateSchemaComponent: CreateSchemaObjectBase {
+    static TeklaContourPlateSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public TeklaContourPlateSchemaComponent(): base("ContourPlate", "ContourPlate", "Creates a TeklaStructures contour plate.", "Speckle 2 Tekla", "Structure") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Tekla";
+
+    internal static Guid internalGuid => new Guid("3b092935-3c2f-c084-eea5-077630507a49");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.TeklaStructures.TeklaContourPlate.ctor(Objects.Structural.Properties.Profiles.SectionProfile,Objects.Geometry.Polyline,System.String,System.String,System.String,Objects.Structural.Materials.StructuralMaterial,Objects.BuiltElements.TeklaStructures.TeklaPosition,Speckle.Core.Models.Base)","Objects.BuiltElements.TeklaStructures.TeklaContourPlate");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class TimberSchemaComponent: CreateSchemaObjectBase {
+    static TimberSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public TimberSchemaComponent(): base("Timber", "Timber", "Creates a Speckle structural material for timber (to be used in structural analysis models)", "Speckle 2 Structural", "Materials") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 Structural";
+
+    internal static Guid internalGuid => new Guid("f11d278f-6a36-fd7c-409d-fb39f52c73f5");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Materials.Timber.ctor(System.String,System.String,System.String,System.String,System.String,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.Materials.Timber");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class TopographySchemaComponent: CreateSchemaObjectBase {
+    static TopographySchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public TopographySchemaComponent(): base("Topography", "Topography", "Creates a Speckle topography", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("b9207a45-eebc-72d6-a411-f496443d8b7f");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Topography.ctor(Objects.Geometry.Mesh)","Objects.BuiltElements.Topography");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class WaffleSlabSchemaComponent: CreateSchemaObjectBase {
+    static WaffleSlabSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public WaffleSlabSchemaComponent(): base("WaffleSlab", "WaffleSlab", "Create an CSI Waffle Slab", "Speckle 2 CSI", "Properties") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 CSI";
+
+    internal static Guid internalGuid => new Guid("b8956ee0-8372-db59-654a-c11c4af5e0f6");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.CSI.Properties.CSIProperty2D+WaffleSlab.ctor(System.String,Objects.Structural.CSI.Analysis.ShellType,Objects.Structural.Materials.StructuralMaterial,System.Double,System.Double,System.Double,System.Double,System.Double,System.Double)","Objects.Structural.CSI.Properties.CSIProperty2D+WaffleSlab");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class WallSchemaComponent: CreateSchemaObjectBase {
+    static WallSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public WallSchemaComponent(): base("Wall", "Wall", "Creates a Speckle wall", "Speckle 2 BIM", "Architecture") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("6878cc65-2628-d00d-e8c0-b130e828a6c7");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Wall.ctor(System.Double,Objects.ICurve,System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.BuiltElements.Wall");
+        base.AddedToDocument(document);
+    }
+}
+
+// This is generated code:
+public class WireSchemaComponent: CreateSchemaObjectBase {
+    static WireSchemaComponent() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
+    public WireSchemaComponent(): base("Wire", "Wire", "Creates a Speckle wire from curve segments and points", "Speckle 2 BIM", "MEP") { }
+    
+    internal static string internalCategory { get; }  = "Speckle 2 BIM";
+
+    internal static Guid internalGuid => new Guid("c10c9c87-b93d-4e98-d2fb-942d182008dc");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
+    public override GH_Exposure Exposure => internalExposure;
+    
+    public override void AddedToDocument(GH_Document document){
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.BuiltElements.Wire.ctor(System.Collections.Generic.List`1[Objects.ICurve])","Objects.BuiltElements.Wire");
+        base.AddedToDocument(document);
+    }
+}
+
+
+}
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/SchemaBuilderGen.tt b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/SchemaBuilderGen.tt
similarity index 75%
rename from ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/SchemaBuilderGen.tt
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/SchemaBuilderGen.tt
index 9fa3b600d3..26b3dff7ad 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/SchemaBuilder/SchemaBuilderGen.tt
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/SchemaBuilderGen.tt
@@ -24,6 +24,7 @@
 #>
 
 using System;
+using System.Linq;
 using Grasshopper.Kernel;
 using ConnectorGrasshopperUtils;
 
@@ -52,15 +53,35 @@ namespace ConnectorGrasshopper {
 #>
 // This is generated code:
 public class <#= compName #>: CreateSchemaObjectBase {
-     
+    static <#= compName #>() {
+       SpeckleGHSettings.SettingsChanged += (_, args) =>
+          {
+            if (!args.Key.StartsWith("Speckle2:tabs.")) return;
+            var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+            if (proxy == null) return;
+            proxy.Exposure = internalExposure;
+          };
+    }
     public <#= compName #>(): base("<#= name #>", "<#= name #>", "<#= description #>", "<#= cat #>", "<#= subcat #>") { }
     
-    public override Guid ComponentGuid => new Guid("<#= ToGuid("secretPhraseToKeepItRandom..." + compName) #>");
+    internal static string internalCategory { get; }  = "<#= cat #>";
+
+    internal static Guid internalGuid => new Guid("<#= ToGuid("secretPhraseToKeepItRandom..." + compName) #>");
+
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.GetTabVisibility(internalCategory)
+      ? GH_Exposure.tertiary
+      : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
 <#
     if (depr != null){
 #>
     public override bool Obsolete => true;
     public override GH_Exposure Exposure => GH_Exposure.hidden;
+<#
+        } else {
+#>
+    public override GH_Exposure Exposure => internalExposure;
 <#
         }
 #>
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/SpeckleGHSettings.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/SpeckleGHSettings.cs
similarity index 54%
rename from ConnectorGrasshopper/ConnectorGrasshopper/SpeckleGHSettings.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/SpeckleGHSettings.cs
index 5c3d22865f..ebd2a16ef0 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/SpeckleGHSettings.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/SpeckleGHSettings.cs
@@ -1,13 +1,21 @@
 using System;
+using System.Reflection;
+using Grasshopper.GUI;
+using Grasshopper.GUI.Ribbon;
 
 namespace ConnectorGrasshopper
 {
   public static class SpeckleGHSettings
   {
-    private const string SELECTED_KIT_NAME = "Speckle2:kit.default.name";
-    private const string MESH_SETTINGS = "Speckle2:kit.meshing.settings";
-    private const string USE_SCHEMA_TAG_STRATEGY = "Speckle2:conversion.schema.tag";
-    private const string SHOW_DEV_COMPONENTS = "Speckle2:dev.components.show";
+    public const string SELECTED_KIT_NAME = "Speckle2:kit.default.name";
+    public const string MESH_SETTINGS = "Speckle2:kit.meshing.settings";
+    public const string USE_SCHEMA_TAG_STRATEGY = "Speckle2:conversion.schema.tag";
+    public const string SHOW_DEV_COMPONENTS = "Speckle2:dev.components.show";
+    public const string HEADLESS_TEMPLATE_FILENAME = "Speckle2:headless.template.name";
+    
+    public static event EventHandler<SettingsChangedEventArgs> SettingsChanged;
+    public static event EventHandler OnMeshSettingsChanged;
+
     /// <summary>
     /// Gets or sets the default selected kit name to be used in this Grasshopper instance.
     /// </summary>
@@ -18,9 +26,10 @@ public static string SelectedKitName
       {
         Grasshopper.Instances.Settings.SetValue(SELECTED_KIT_NAME, value);
         Grasshopper.Instances.Settings.WritePersistentSettings();
+        OnSettingsChanged(SELECTED_KIT_NAME);
       }
     }
-    public static event EventHandler OnMeshSettingsChanged;
+    
     public static SpeckleMeshSettings MeshSettings
     {
       get => (SpeckleMeshSettings)Grasshopper.Instances.Settings.GetValue(MESH_SETTINGS, (int)SpeckleMeshSettings.Default);
@@ -29,8 +38,10 @@ public static SpeckleMeshSettings MeshSettings
         Grasshopper.Instances.Settings.SetValue(MESH_SETTINGS, (int)value);
         Grasshopper.Instances.Settings.WritePersistentSettings();
         OnMeshSettingsChanged?.Invoke(null, EventArgs.Empty);
+        OnSettingsChanged(MESH_SETTINGS);
       }
     }
+    
     /// <summary>
     /// Gets or sets the output type of the Schema builder nodes:
     /// If true: Output will be the `main geometry` with the schema attached as a property.
@@ -44,9 +55,11 @@ public static bool UseSchemaTag
       {
         Grasshopper.Instances.Settings.SetValue(USE_SCHEMA_TAG_STRATEGY, value);
         Grasshopper.Instances.Settings.WritePersistentSettings();
+        OnSettingsChanged(USE_SCHEMA_TAG_STRATEGY);
       }
     }
-
+    
+    
     public static bool ShowDevComponents
     {
       get => Grasshopper.Instances.Settings.GetValue(SHOW_DEV_COMPONENTS, false);
@@ -54,6 +67,19 @@ public static bool ShowDevComponents
       {
         Grasshopper.Instances.Settings.SetValue(SHOW_DEV_COMPONENTS, value);
         Grasshopper.Instances.Settings.WritePersistentSettings();
+        OnSettingsChanged(SHOW_DEV_COMPONENTS);
+        PopulateRibbon();
+      }
+    }
+    
+    public static string HeadlessTemplateFilename
+    {
+      get => Grasshopper.Instances.Settings.GetValue(HEADLESS_TEMPLATE_FILENAME, "headless.3dm");
+      set
+      {
+        Grasshopper.Instances.Settings.SetValue(HEADLESS_TEMPLATE_FILENAME, value);
+        Grasshopper.Instances.Settings.WritePersistentSettings();
+        OnSettingsChanged(HEADLESS_TEMPLATE_FILENAME);
       }
     }
     
@@ -65,8 +91,34 @@ public static bool GetTabVisibility(string name)
 
     public static void SetTabVisibility(string name, bool value)
     {
-      Grasshopper.Instances.Settings.SetValue($"Speckle2:tabs.{name}", value);
+      var key = $"Speckle2:tabs.{name}";
+      Grasshopper.Instances.Settings.SetValue(key, value);
       Grasshopper.Instances.Settings.WritePersistentSettings();
+      OnSettingsChanged(key);
+      PopulateRibbon();
+    }
+
+    private static void OnSettingsChanged(string key)
+    {
+      SettingsChanged?.Invoke(null, new SettingsChangedEventArgs(key));
+    }
+
+    private static void PopulateRibbon()
+    {
+      var ribbon = typeof(GH_DocumentEditor)
+        .GetProperty("Ribbon", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+        ?.GetValue(Grasshopper.Instances.DocumentEditor) as GH_Ribbon;
+      ribbon?.PopulateRibbon();
+    }
+  }
+  
+  public class SettingsChangedEventArgs : EventArgs
+  {
+    public string Key;
+
+    public SettingsChangedEventArgs(string key)
+    {
+      Key = key;
     }
   }
 
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamCreateComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamCreateComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamCreateComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamCreateComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamDetailsComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamDetailsComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamDetailsComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamDetailsComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamGetComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamGetComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamGetComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamGetComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamListComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamListComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamListComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamListComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamUpdateComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamUpdateComponent.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Streams/StreamUpdateComponent.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Streams/StreamUpdateComponent.cs
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Transports/SendReceiveTransport.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/SendReceiveTransport.cs
similarity index 66%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Transports/SendReceiveTransport.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/SendReceiveTransport.cs
index 536423fd9b..2b5b7aaff3 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Transports/SendReceiveTransport.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/SendReceiveTransport.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using System.Threading.Tasks;
 using ConnectorGrasshopper.Extras;
 using Grasshopper.Kernel;
@@ -13,13 +14,32 @@ namespace ConnectorGrasshopper.Transports
 {
   public class SendReceiveTransport : GH_SpeckleComponent
   {
-    public override Guid ComponentGuid { get => new Guid("4229B8DC-9F81-49A3-9EF9-DF3DE0B8E4B6"); }
+    internal static Guid internalGuid => new Guid("4229B8DC-9F81-49A3-9EF9-DF3DE0B8E4B6");
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
 
     protected override Bitmap Icon => Properties.Resources.sendToTransport;
 
-    public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
+    public override GH_Exposure Exposure => internalExposure;
 
-    public SendReceiveTransport() : base("Send To Transports", "ST", "Sends an object to a list of given transports: the object will be stored in each of them. Please use this component with caution: it can freeze your defintion. It also does not perform any conversions, so ensure that the object input already has converted speckle objects inside.", ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS) { }
+    static SendReceiveTransport()
+    {
+      SpeckleGHSettings.SettingsChanged += (_, args) =>
+      {
+        if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+        var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+        if (proxy == null) return;
+        proxy.Exposure = internalExposure;
+      };
+    }
+    
+    public SendReceiveTransport() : base("Send To Transports", "ST",
+      "Sends an object to a list of given transports: the object will be stored in each of them. Please use this component with caution: it can freeze your defintion. It also does not perform any conversions, so ensure that the object input already has converted speckle objects inside.",
+      ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS)
+    {
+    }
 
     protected override void RegisterInputParams(GH_InputParamManager pManager)
     {
@@ -69,13 +89,31 @@ protected override void SolveInstance(IGH_DataAccess DA)
 
   public class ReceiveFromTransport : GH_SpeckleComponent
   {
-    public override Guid ComponentGuid { get => new Guid("8C7C6CA5-1557-4216-810B-F64E710526D0"); }
+    internal static Guid internalGuid => new Guid("8C7C6CA5-1557-4216-810B-F64E710526D0");
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
 
     protected override Bitmap Icon => Properties.Resources.receiveFromTransport;
 
-    public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
+    public override GH_Exposure Exposure => internalExposure;
 
-    public ReceiveFromTransport() : base("Receive From Transports", "RT", "Receives a list of objects from a given transport. Please use this component with caution: it can freeze your defintion. It also does not perform any conversions on the output.", ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS) { }
+    static ReceiveFromTransport()
+    {
+      SpeckleGHSettings.SettingsChanged += (_, args) =>
+      {
+        if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+        var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+        if (proxy == null) return;
+        proxy.Exposure = internalExposure;
+      };
+    }
+    public ReceiveFromTransport() : base("Receive From Transports", "RT",
+      "Receives a list of objects from a given transport. Please use this component with caution: it can freeze your defintion. It also does not perform any conversions on the output.",
+      ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS)
+    {
+    }
 
     protected override void RegisterInputParams(GH_InputParamManager pManager)
     {
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Disk.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Disk.cs
similarity index 55%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Disk.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Disk.cs
index 1e6e0bb792..d8c8294cf4 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Disk.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Disk.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using Grasshopper.Kernel;
 using Logging = Speckle.Core.Logging;
 
@@ -8,13 +9,32 @@ namespace ConnectorGrasshopper.Transports
 {
   public class DiskTransportComponent : GH_SpeckleComponent
   {
-    public override Guid ComponentGuid { get => new Guid("BA068B11-2BC0-4669-BC73-09CF16820659"); }
+    internal static Guid internalGuid => new Guid("BA068B11-2BC0-4669-BC73-09CF16820659");
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
 
     protected override Bitmap Icon => Properties.Resources.DiskTransport;
 
-    public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
+    public override GH_Exposure Exposure => internalExposure;
 
-    public DiskTransportComponent() : base("Disk Transport", "Disk", "Creates a Disk Transport. This transport will store objects in files in a folder that you can specify (including one on a network drive!). It's useful for understanding how Speckle's decomposition api works. It's not meant to be performant - it's useful for debugging purposes - e.g., when developing a new class/object model you can understand easily the relative sizes of the resulting objects.", ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS) { }
+    static DiskTransportComponent()
+    {
+      SpeckleGHSettings.SettingsChanged += (_, args) =>
+      {
+        if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+        var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+        if (proxy == null) return;
+        proxy.Exposure = internalExposure;
+      };
+    }
+    
+    public DiskTransportComponent() : base("Disk Transport", "Disk",
+      "Creates a Disk Transport. This transport will store objects in files in a folder that you can specify (including one on a network drive!). It's useful for understanding how Speckle's decomposition api works. It's not meant to be performant - it's useful for debugging purposes - e.g., when developing a new class/object model you can understand easily the relative sizes of the resulting objects.",
+      ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS)
+    {
+    }
 
     protected override void RegisterInputParams(GH_InputParamManager pManager)
     {
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Memory.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Memory.cs
similarity index 60%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Memory.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Memory.cs
index 7866e42e80..b76d170065 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Memory.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Memory.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using Grasshopper.Kernel;
 using Speckle.Core.Transports;
 using Logging = Speckle.Core.Logging;
@@ -9,13 +10,31 @@ namespace ConnectorGrasshopper.Transports
 {
   public class MemoryTransportComponent : GH_SpeckleComponent
   {
-    public override Guid ComponentGuid { get => new Guid("B3E7A1E0-FB96-45AE-9F47-54D1B495AAC9"); }
+    internal static Guid internalGuid => new Guid("B3E7A1E0-FB96-45AE-9F47-54D1B495AAC9");
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid => internalGuid;
 
     protected override Bitmap Icon => Properties.Resources.MemoryTransport;
 
-    public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
+    public override GH_Exposure Exposure => internalExposure;
 
-    public MemoryTransportComponent() : base("Memory Transport", "Memory", "Creates a Memory Transport. This is useful for debugging, or just sending data around one grasshopper defintion. We don't recommend you use it!", ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS) { }
+    static MemoryTransportComponent()
+    {
+      SpeckleGHSettings.SettingsChanged += (_, args) =>
+      {
+        if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+        var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == internalGuid);
+        if (proxy == null) return;
+        proxy.Exposure = internalExposure;
+      };
+    }
+    public MemoryTransportComponent() : base("Memory Transport", "Memory",
+      "Creates a Memory Transport. This is useful for debugging, or just sending data around one grasshopper defintion. We don't recommend you use it!",
+      ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS)
+    {
+    }
 
     protected override void RegisterInputParams(GH_InputParamManager pManager)
     {
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Sqlite.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Sqlite.cs
similarity index 77%
rename from ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Sqlite.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Sqlite.cs
index 10ad68993d..797f14e225 100644
--- a/ConnectorGrasshopper/ConnectorGrasshopper/Transports/Transports.Sqlite.cs
+++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Transports/Transports.Sqlite.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using Grasshopper.Kernel;
 using Speckle.Core.Api;
 using Speckle.Core.Transports;
@@ -11,13 +12,26 @@ namespace ConnectorGrasshopper.Transports
 {
   public class SqliteTransportComponent : GH_SpeckleComponent
   {
-    public override Guid ComponentGuid { get => new Guid("DFFAF45E-06A8-4458-85D8-74FDA8DF3268"); }
+    internal static Guid internalGuid => new Guid("DFFAF45E-06A8-4458-85D8-74FDA8DF3268");
+    internal static GH_Exposure internalExposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.primary : GH_Exposure.hidden;
+
+    public override Guid ComponentGuid
+    {
+      get => internalGuid;
+    }
 
     protected override Bitmap Icon => Properties.Resources.SQLiteTransport;
 
     public override GH_Exposure Exposure => SpeckleGHSettings.ShowDevComponents ? GH_Exposure.secondary : GH_Exposure.hidden;
 
-    public SqliteTransportComponent() : base("Sqlite Transport", "Sqlite", "Creates a Sqlite Transport. This transport will store its objects in a sqlite database at the location you will specify (including a network drive!).", ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS) { }
+    public SqliteTransportComponent() : base("Sqlite Transport", "Sqlite", "Creates a Sqlite Transport. This transport will store its objects in a sqlite database at the location you will specify (including a network drive!).", ComponentCategories.SECONDARY_RIBBON, ComponentCategories.TRANSPORTS) {       SpeckleGHSettings.SettingsChanged += (_, args) =>
+    {
+      if (args.Key != SpeckleGHSettings.SHOW_DEV_COMPONENTS) return;
+        
+      var proxy = Grasshopper.Instances.ComponentServer.ObjectProxies.FirstOrDefault(p => p.Guid == ComponentGuid);
+      if (proxy == null) return;
+      proxy.Exposure = Exposure;
+    };}
 
     protected override void RegisterInputParams(GH_InputParamManager pManager)
     {
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/UpgradeUtilities.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/UpgradeUtilities.cs
similarity index 100%
rename from ConnectorGrasshopper/ConnectorGrasshopper/UpgradeUtilities.cs
rename to ConnectorGrasshopper/ConnectorGrasshopperShared/UpgradeUtilities.cs
diff --git a/ConnectorRevit/ConnectorRevit.sln b/ConnectorRevit/ConnectorRevit.sln
index effc6b5c40..b755788343 100644
--- a/ConnectorRevit/ConnectorRevit.sln
+++ b/ConnectorRevit/ConnectorRevit.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopUI", "..\DesktopUI\DesktopUI\DesktopUI.csproj", "{A97C3046-2D55-4C49-AB40-A3C2194B82FA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "..\Core\Core\Core.csproj", "{521D4AEE-08CF-4913-BBE8-5511D176D126}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Objects", "..\Objects\Objects\Objects.csproj", "{BE852BE3-37B8-4B62-AC2C-0872C41A2542}"
@@ -15,8 +13,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterRevitShared", "..\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterRevit", "ConverterRevit", "{0FED0483-A54F-44EE-88FB-2FA6BAD13891}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2019", "..\Objects\Converters\ConverterRevit\ConverterRevit2019\ConverterRevit2019.csproj", "{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2020", "..\Objects\Converters\ConverterRevit\ConverterRevit2020\ConverterRevit2020.csproj", "{240EAD7E-EF10-482A-B299-3B85B64B032F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2021", "..\Objects\Converters\ConverterRevit\ConverterRevit2021\ConverterRevit2021.csproj", "{CFBD9A83-5AA2-4849-8735-28D4F73F4F56}"
@@ -27,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2021", "Conne
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2020", "ConnectorRevit2020\ConnectorRevit2020.csproj", "{8A53B084-20D8-48F6-9591-9D53CFA74130}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2019", "ConnectorRevit2019\ConnectorRevit2019.csproj", "{EF418256-8118-47B4-8386-A945946FB92D}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RevitVersionProjects", "RevitVersionProjects", "{89C98BAA-C2BC-4EAF-AB97-C513A5A2372D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterRevitTests", "..\Objects\Converters\ConverterRevit\ConverterRevitTests\ConverterRevitTests.csproj", "{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C}"
@@ -47,7 +41,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2023", "Conne
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaHwndHost", "..\DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj", "{D8576AEE-6EF4-4BD7-B024-864653EC41E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterDxf", "..\Objects\Converters\ConverterDxf\ConverterDxf\ConverterDxf.csproj", "{64A2BFC9-8711-4C9D-A1B4-BEE678C8E640}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDxf", "..\Objects\Converters\ConverterDxf\ConverterDxf\ConverterDxf.csproj", "{64A2BFC9-8711-4C9D-A1B4-BEE678C8E640}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -60,9 +54,7 @@ Global
 		ConnectorRevit\ConnectorRevit.projitems*{8a53b084-20d8-48f6-9591-9d53cfa74130}*SharedItemsImports = 4
 		..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{c74e4c61-ca68-47f9-825e-91b7a5c4546d}*SharedItemsImports = 5
 		..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{cfbd9a83-5aa2-4849-8735-28d4f73f4f56}*SharedItemsImports = 5
-		..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{df6b36cf-38e7-4ee1-a319-0e6842a87b05}*SharedItemsImports = 5
 		ConnectorRevit\ConnectorRevit.projitems*{dfdfdbb8-018b-4dcb-a012-54227abf53a7}*SharedItemsImports = 4
-		ConnectorRevit\ConnectorRevit.projitems*{ef418256-8118-47b4-8386-a945946fb92d}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,14 +63,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|x64.ActiveCfg = Debug|x64
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Debug|x64.Build.0 = Debug|x64
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|x64.ActiveCfg = Release|x64
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA}.Release|x64.Build.0 = Release|x64
 		{521D4AEE-08CF-4913-BBE8-5511D176D126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{521D4AEE-08CF-4913-BBE8-5511D176D126}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{521D4AEE-08CF-4913-BBE8-5511D176D126}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -95,14 +79,6 @@ Global
 		{BE852BE3-37B8-4B62-AC2C-0872C41A2542}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BE852BE3-37B8-4B62-AC2C-0872C41A2542}.Release|x64.ActiveCfg = Release|Any CPU
 		{BE852BE3-37B8-4B62-AC2C-0872C41A2542}.Release|x64.Build.0 = Release|Any CPU
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}.Debug|x64.Build.0 = Debug|Any CPU
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}.Release|x64.ActiveCfg = Release|Any CPU
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05}.Release|x64.Build.0 = Release|Any CPU
 		{240EAD7E-EF10-482A-B299-3B85B64B032F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{240EAD7E-EF10-482A-B299-3B85B64B032F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{240EAD7E-EF10-482A-B299-3B85B64B032F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -135,14 +111,6 @@ Global
 		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|x64.ActiveCfg = Release|Any CPU
 		{8A53B084-20D8-48F6-9591-9D53CFA74130}.Release|x64.Build.0 = Release|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Debug|x64.Build.0 = Debug|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Release|x64.ActiveCfg = Release|Any CPU
-		{EF418256-8118-47B4-8386-A945946FB92D}.Release|x64.Build.0 = Release|Any CPU
 		{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -219,17 +187,14 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A97C3046-2D55-4C49-AB40-A3C2194B82FA} = {39F07EF9-5867-4062-886D-2417C86305C2}
 		{521D4AEE-08CF-4913-BBE8-5511D176D126} = {39F07EF9-5867-4062-886D-2417C86305C2}
 		{BE852BE3-37B8-4B62-AC2C-0872C41A2542} = {39F07EF9-5867-4062-886D-2417C86305C2}
 		{2DCD648D-DCA5-4D2A-8B14-AD2CB85D24B0} = {0FED0483-A54F-44EE-88FB-2FA6BAD13891}
 		{0FED0483-A54F-44EE-88FB-2FA6BAD13891} = {39F07EF9-5867-4062-886D-2417C86305C2}
-		{DF6B36CF-38E7-4EE1-A319-0E6842A87B05} = {0FED0483-A54F-44EE-88FB-2FA6BAD13891}
 		{240EAD7E-EF10-482A-B299-3B85B64B032F} = {0FED0483-A54F-44EE-88FB-2FA6BAD13891}
 		{CFBD9A83-5AA2-4849-8735-28D4F73F4F56} = {0FED0483-A54F-44EE-88FB-2FA6BAD13891}
 		{27A79ACA-7EA8-4406-8BB8-216578CC3AB7} = {89C98BAA-C2BC-4EAF-AB97-C513A5A2372D}
 		{8A53B084-20D8-48F6-9591-9D53CFA74130} = {89C98BAA-C2BC-4EAF-AB97-C513A5A2372D}
-		{EF418256-8118-47B4-8386-A945946FB92D} = {89C98BAA-C2BC-4EAF-AB97-C513A5A2372D}
 		{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C} = {39F07EF9-5867-4062-886D-2417C86305C2}
 		{C74E4C61-CA68-47F9-825E-91B7A5C4546D} = {0FED0483-A54F-44EE-88FB-2FA6BAD13891}
 		{DFDFDBB8-018B-4DCB-A012-54227ABF53A7} = {89C98BAA-C2BC-4EAF-AB97-C513A5A2372D}
diff --git a/ConnectorRevit/ConnectorRevit/ConnectorRevit.projitems b/ConnectorRevit/ConnectorRevit/ConnectorRevit.projitems
index 5b241da0da..39b7326204 100644
--- a/ConnectorRevit/ConnectorRevit/ConnectorRevit.projitems
+++ b/ConnectorRevit/ConnectorRevit/ConnectorRevit.projitems
@@ -33,30 +33,21 @@
     <Compile Include="$(MSBuildThisFileDirectory)ConnectorRevitUtils.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entry\App.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entry\CmdAvailabilityViews.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Entry\QuickShareCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Entry\OneClickSendCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entry\SchedulerCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Entry\SpeckleRevitCommand2.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entry\SpeckleRevitCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entry\HelpCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)RevitVersionHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Revit\ErrorEater.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExternalEventHandler.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Revit\FamilyLoadOption.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Storage\StreamStateManager2.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Storage\StreamStateManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit2\ConnectorBindingsRevit2 .Settings.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit2\ConnectorBindingsRevit2.Events.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit2\ConnectorBindingsRevit2.Mappings.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit2\ConnectorBindingsRevit2.Receive.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit2\ConnectorBindingsRevit2.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.Selection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit .Settings.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.Events.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.Mappings.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.Previews.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.Receive.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.Send.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.ClientOperations.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit2\ConnectorBindingsRevit2.Selection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit2\ConnectorBindingsRevit2.Send.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.Selection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRevit.Send.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\Panel.xaml.cs">
       <DependentUpon>Panel.xaml</DependentUpon>
     </Compile>
diff --git a/ConnectorRevit/ConnectorRevit/ConnectorRevitUtils.cs b/ConnectorRevit/ConnectorRevit/ConnectorRevitUtils.cs
index 73628e8eec..159a658e0d 100644
--- a/ConnectorRevit/ConnectorRevit/ConnectorRevitUtils.cs
+++ b/ConnectorRevit/ConnectorRevit/ConnectorRevitUtils.cs
@@ -313,7 +313,7 @@ public static string ObjectDescriptor(Element obj)
       BuiltInCategory.OST_Ramps,
       BuiltInCategory.OST_SpecialityEquipment,
       BuiltInCategory.OST_Rebar,
-#if !REVIT2019 && !REVIT2020 && !REVIT2021
+#if !REVIT2020 && !REVIT2021
       BuiltInCategory.OST_AudioVisualDevices,
       BuiltInCategory.OST_FireProtection,
       BuiltInCategory.OST_FoodServiceEquipment,
@@ -323,7 +323,7 @@ public static string ObjectDescriptor(Element obj)
       BuiltInCategory.OST_TemporaryStructure,
       BuiltInCategory.OST_VerticalCirculation,
 #endif
-#if !REVIT2019 && !REVIT2020 && !REVIT2021 && !REVIT2022
+#if !REVIT2020 && !REVIT2021 && !REVIT2022
        BuiltInCategory.OST_MechanicalControlDevices,
 #endif
   };
diff --git a/ConnectorRevit/ConnectorRevit/Entry/App.cs b/ConnectorRevit/ConnectorRevit/Entry/App.cs
index 5f0d8ae2ea..7971c4757b 100644
--- a/ConnectorRevit/ConnectorRevit/Entry/App.cs
+++ b/ConnectorRevit/ConnectorRevit/Entry/App.cs
@@ -37,22 +37,9 @@ public Result OnStartup(UIControlledApplication application)
       var specklePanel = application.CreateRibbonPanel(tabName, "Speckle 2");
 
       string path = typeof(App).Assembly.Location;
-#if REVIT2019
-      //desctopui 1
-      var speckleButton = specklePanel.AddItem(new PushButtonData("Speckle 2", "Revit Connector", typeof(App).Assembly.Location, typeof(SpeckleRevitCommand).FullName)) as PushButton;
-
-      if (speckleButton != null)
-      {
-        speckleButton.Image = LoadPngImgSource("Speckle.ConnectorRevit.Assets.logo16_fade.png", path);
-        speckleButton.LargeImage = LoadPngImgSource("Speckle.ConnectorRevit.Assets.logo32_fade.png", path);
-        speckleButton.ToolTip = "Speckle Connector for Revit (old)";
-        speckleButton.AvailabilityClassName = typeof(CmdAvailabilityViews).FullName;
-        speckleButton.SetContextualHelp(new ContextualHelp(ContextualHelpType.Url, "https://speckle.systems"));
-      }
-#else
 
       //desktopui 2
-      var speckleButton2 = specklePanel.AddItem(new PushButtonData("Speckle 2", "Revit Connector", typeof(App).Assembly.Location, typeof(SpeckleRevitCommand2).FullName)) as PushButton;
+      var speckleButton2 = specklePanel.AddItem(new PushButtonData("Speckle 2", "Revit Connector", typeof(App).Assembly.Location, typeof(SpeckleRevitCommand).FullName)) as PushButton;
 
       if (speckleButton2 != null)
       {
@@ -76,34 +63,6 @@ public Result OnStartup(UIControlledApplication application)
         schedulerButton.SetContextualHelp(new ContextualHelp(ContextualHelpType.Url, "https://speckle.systems"));
       }
 
-      // one click send
-      var speckleButtonSend = specklePanel.AddItem(new PushButtonData("Send", "Send to Speckle", typeof(App).Assembly.Location, typeof(OneClickSendCommand).FullName)) as PushButton;
-
-      if (speckleButtonSend != null)
-      {
-        speckleButtonSend.Image = LoadPngImgSource("Speckle.ConnectorRevit.Assets.oneclick16.png", path);
-        speckleButtonSend.LargeImage = LoadPngImgSource("Speckle.ConnectorRevit.Assets.oneclick32.png", path);
-        speckleButtonSend.ToolTipImage = LoadPngImgSource("Speckle.ConnectorRevit.Assets.oneclick32.png", path);
-        speckleButtonSend.ToolTip = "Sends your selected file objects to Speckle, or the entire model if nothing is selected.";
-        speckleButtonSend.AvailabilityClassName = typeof(CmdAvailabilityViews).FullName;
-        speckleButtonSend.SetContextualHelp(new ContextualHelp(ContextualHelpType.Url, "https://speckle.systems"));
-      }
-
-
-      // quick share
-      var speckleButtonShare = specklePanel.AddItem(new PushButtonData("Share", "Quick Share", typeof(App).Assembly.Location, typeof(QuickShareCommand).FullName)) as PushButton;
-
-      if (speckleButtonShare != null)
-      {
-        speckleButtonShare.Image = LoadPngImgSource("Speckle.ConnectorRevit.Assets.share16.png", path);
-        speckleButtonShare.LargeImage = LoadPngImgSource("Speckle.ConnectorRevit.Assets.share32.png", path);
-        speckleButtonShare.ToolTipImage = LoadPngImgSource("Speckle.ConnectorRevit.Assets.share32.png", path);
-        speckleButtonShare.ToolTip = "Quickly share the selected evelemtns via Speckle, or the entire model if nothing is selected.";
-        speckleButtonShare.AvailabilityClassName = typeof(CmdAvailabilityViews).FullName;
-        speckleButtonShare.SetContextualHelp(new ContextualHelp(ContextualHelpType.Url, "https://speckle.systems"));
-      }
-#endif
-
       PulldownButton helpPulldown = specklePanel.AddItem(new PulldownButtonData("Help&Resources", "Help & Resources")) as PulldownButton;
       helpPulldown.Image = LoadPngImgSource("Speckle.ConnectorRevit.Assets.help16.png", path);
       helpPulldown.LargeImage = LoadPngImgSource("Speckle.ConnectorRevit.Assets.help32.png", path);
@@ -141,29 +100,19 @@ private void ControlledApplication_ApplicationInitialized(object sender, Autodes
         AppInstance = new UIApplication(sender as Application);
         AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(OnAssemblyResolve);
 
-
-#if REVIT2019
-      //DUI1 - Set up bindings now as they subscribe to some document events and it's better to do it now
-      SpeckleRevitCommand.Bindings = new ConnectorBindingsRevit(AppInstance);
-      var eventHandler = ExternalEvent.Create(new SpeckleExternalEventHandler(SpeckleRevitCommand.Bindings));
-      SpeckleRevitCommand.Bindings.SetExecutorAndInit(eventHandler);
-#else
         //DUI2 - pre build app, so that it's faster to open up
-        SpeckleRevitCommand2.InitAvalonia();
-        var bindings = new ConnectorBindingsRevit2(AppInstance);
+        SpeckleRevitCommand.InitAvalonia();
+        var bindings = new ConnectorBindingsRevit(AppInstance);
         bindings.RegisterAppEvents();
-        SpeckleRevitCommand2.Bindings = bindings;
+        SpeckleRevitCommand.Bindings = bindings;
         SchedulerCommand.Bindings = bindings;
-        OneClickSendCommand.Bindings = bindings;
-        QuickShareCommand.Bindings = bindings;
 
         //This is also called in DUI, adding it here to know how often the connector is loaded and used
         Setup.Init(bindings.GetHostAppNameVersion(), bindings.GetHostAppName());
         Analytics.TrackEvent(Analytics.Events.Registered, null, false);
 
-        SpeckleRevitCommand2.RegisterPane();
+        SpeckleRevitCommand.RegisterPane();
 
-#endif
         //AppInstance.ViewActivated += new EventHandler<ViewActivatedEventArgs>(Application_ViewActivated);
       }
       catch (Exception ex)
diff --git a/ConnectorRevit/ConnectorRevit/Entry/OneClickSendCommand.cs b/ConnectorRevit/ConnectorRevit/Entry/OneClickSendCommand.cs
deleted file mode 100644
index c7194813fd..0000000000
--- a/ConnectorRevit/ConnectorRevit/Entry/OneClickSendCommand.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Autodesk.Revit.Attributes;
-using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-using Avalonia.Controls;
-using DesktopUI2.Models;
-using DesktopUI2.ViewModels;
-using DesktopUI2.Views;
-using Speckle.ConnectorRevit.UI;
-using Speckle.Core.Logging;
-
-namespace Speckle.ConnectorRevit.Entry
-{
-  [Transaction(TransactionMode.Manual)]
-  public class OneClickSendCommand : IExternalCommand
-  {
-    [DllImport("user32.dll", SetLastError = true)]
-    static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr value);
-    const int GWL_HWNDPARENT = -8;
-    public static ConnectorBindingsRevit2 Bindings { get; set; }
-    public static StreamState FileStream { get; set; }
-
-    public static Window MainWindow { get; private set; }
-
-    private static Avalonia.Application AvaloniaApp { get; set; }
-
-    internal static UIApplication uiapp;
-
-    public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
-    {
-      uiapp = commandData.Application;
-
-      // intialize dui2
-      CreateOrFocusSpeckle(false);
-
-      // send
-      var oneClick = new OneClickViewModel(Bindings, FileStream);
-      oneClick.Send();
-      FileStream = oneClick.FileStream;
-
-      return Result.Succeeded;
-    }
-
-    public static void CreateOrFocusSpeckle(bool showWindow = true)
-    {
-
-      try
-      {
-        if (MainWindow == null)
-        {
-          var viewModel = new MainViewModel(Bindings);
-          MainWindow = new MainWindow
-          {
-            DataContext = viewModel
-          };
-
-          //massive hack: we start the avalonia main loop and stop it immediately (since it's thread blocking)
-          //to avoid an annoying error when closing revit
-          var cts = new CancellationTokenSource();
-          cts.CancelAfter(100);
-          AvaloniaApp.Run(cts.Token);
-        }
-
-
-        if (showWindow)
-        {
-          MainWindow.Show();
-          MainWindow.Activate();
-
-          //required to gracefully quit avalonia and the skia processes
-          //can also be used to manually do so
-          //https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes
-
-
-          if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-          {
-            var parentHwnd = uiapp.MainWindowHandle;
-            var hwnd = MainWindow.PlatformImpl.Handle.Handle;
-            SetWindowLongPtr(hwnd, GWL_HWNDPARENT, parentHwnd);
-          }
-        }
-      }
-      catch (Exception ex)
-      {
-        Log.CaptureException(ex, Sentry.SentryLevel.Error);
-        var td = new TaskDialog("Error");
-        td.MainContent = $"Oh no! Something went wrong while loading Speckle, please report it on the forum:\n{ex.Message}";
-        td.AddCommandLink(TaskDialogCommandLinkId.CommandLink1, "Report issue on our Community Forum");
-
-        TaskDialogResult tResult = td.Show();
-
-        if (TaskDialogResult.CommandLink1 == tResult)
-        {
-          Process.Start("https://speckle.community/");
-        }
-      }
-    }
-
-    private static void AppMain(Avalonia.Application app, string[] args)
-    {
-      AvaloniaApp = app;
-    }
-
-  }
-
-}
diff --git a/ConnectorRevit/ConnectorRevit/Entry/QuickShareCommand.cs b/ConnectorRevit/ConnectorRevit/Entry/QuickShareCommand.cs
deleted file mode 100644
index cde12132b7..0000000000
--- a/ConnectorRevit/ConnectorRevit/Entry/QuickShareCommand.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using Autodesk.Revit.Attributes;
-using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-using DesktopUI2.ViewModels.Share;
-using DesktopUI2.Views;
-using Speckle.ConnectorRevit.UI;
-
-namespace Speckle.ConnectorRevit.Entry
-{
-  [Transaction(TransactionMode.Manual)]
-  public class QuickShareCommand : IExternalCommand
-  {
-    [DllImport("user32.dll", SetLastError = true)]
-    static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr value);
-    const int GWL_HWNDPARENT = -8;
-
-    internal static UIApplication uiapp;
-
-    public static ConnectorBindingsRevit2 Bindings { get; set; }
-
-
-    public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
-    {
-      uiapp = commandData.Application;
-      CreateOrFocusSpeckle();
-
-      return Result.Succeeded;
-    }
-
-    public static void CreateOrFocusSpeckle()
-    {
-
-      var scheduler = new Share
-      {
-        DataContext = new ShareViewModel(Bindings)
-      };
-
-      scheduler.Show();
-
-      if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-      {
-        var parentHwnd = uiapp.MainWindowHandle;
-        var hwnd = scheduler.PlatformImpl.Handle.Handle;
-        SetWindowLongPtr(hwnd, GWL_HWNDPARENT, parentHwnd);
-      }
-
-    }
-  }
-
-}
diff --git a/ConnectorRevit/ConnectorRevit/Entry/SchedulerCommand.cs b/ConnectorRevit/ConnectorRevit/Entry/SchedulerCommand.cs
index 6c87a74689..b657989f02 100644
--- a/ConnectorRevit/ConnectorRevit/Entry/SchedulerCommand.cs
+++ b/ConnectorRevit/ConnectorRevit/Entry/SchedulerCommand.cs
@@ -18,7 +18,7 @@ public class SchedulerCommand : IExternalCommand
 
     internal static UIApplication uiapp;
 
-    public static ConnectorBindingsRevit2 Bindings { get; set; }
+    public static ConnectorBindingsRevit Bindings { get; set; }
 
 
     public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
diff --git a/ConnectorRevit/ConnectorRevit/Entry/SpeckleRevitCommand.cs b/ConnectorRevit/ConnectorRevit/Entry/SpeckleRevitCommand.cs
index bf13f2698a..2be1b81517 100644
--- a/ConnectorRevit/ConnectorRevit/Entry/SpeckleRevitCommand.cs
+++ b/ConnectorRevit/ConnectorRevit/Entry/SpeckleRevitCommand.cs
@@ -1,69 +1,211 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Windows;
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Threading;
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.ReactiveUI;
+using DesktopUI2.ViewModels;
+using DesktopUI2.Views;
 using Speckle.ConnectorRevit.UI;
-using Speckle.DesktopUI;
-using Stylet.Xaml;
+using Speckle.Core.Logging;
 
 namespace Speckle.ConnectorRevit.Entry
 {
   [Transaction(TransactionMode.Manual)]
   public class SpeckleRevitCommand : IExternalCommand
   {
-    public static Bootstrapper Bootstrapper { get; set; }
+
+    public static bool UseDockablePanel = true;
+
+    //window stuff
+    [DllImport("user32.dll", SetLastError = true)]
+    static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr value);
+    const int GWL_HWNDPARENT = -8;
+    public static Window MainWindow { get; private set; }
+    private static Avalonia.Application AvaloniaApp { get; set; }
+    //end window stuff
+
     public static ConnectorBindingsRevit Bindings { get; set; }
 
+    private static Panel _panel { get; set; }
+
+
+    internal static DockablePaneId PanelId = new DockablePaneId(new Guid("{0A866FB8-8FD5-4DE8-B24B-56F4FA5B0836}"));
+
+
+    public static void InitAvalonia()
+    {
+      BuildAvaloniaApp().SetupWithoutStarting();
+    }
+
+    public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<DesktopUI2.App>()
+      .UsePlatformDetect()
+      .With(new SkiaOptions { MaxGpuResourceSizeBytes = 8096000 })
+      .With(new Win32PlatformOptions { AllowEglInitialization = true, EnableMultitouch = false })
+      .LogToTrace()
+      .UseReactiveUI();
+
+
+
     public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
     {
-      OpenOrFocusSpeckle(commandData.Application);
+
+      if (UseDockablePanel)
+      {
+        try
+        {
+          RegisterPane();
+          var panel = App.AppInstance.GetDockablePane(PanelId);
+          panel.Show();
+        }
+        catch (Exception ex)
+        {
+          Log.CaptureException(ex, Sentry.SentryLevel.Error);
+        }
+      }
+      else
+        CreateOrFocusSpeckle();
+
+
+
       return Result.Succeeded;
     }
 
-    public static void OpenOrFocusSpeckle(UIApplication app)
+    internal static void RegisterPane()
     {
       try
       {
-        AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(OnAssemblyResolve);
+        if (!UseDockablePanel)
+          return;
 
-        if (Bootstrapper != null)
+        var registered = DockablePane.PaneIsRegistered(PanelId);
+        var created = DockablePane.PaneExists(PanelId);
+
+        if (registered && created)
         {
-          Bootstrapper.ShowRootView();
+          _panel.Init();
           return;
         }
 
-        Bootstrapper = new Bootstrapper() { Bindings = Bindings };
+        if (!registered)
+        {
+          //Register dockable panel
+          var viewModel = new MainViewModel(Bindings);
+          _panel = new Panel
+          {
+            DataContext = viewModel
+          };
+          App.AppInstance.RegisterDockablePane(PanelId, "Speckle", _panel);
+          _panel.Init();
+        }
+        created = DockablePane.PaneExists(PanelId);
+
+        //if revit was launched double-clicking on a Revit file, we're screwed
+        //could maybe show the old window?
+        if (!created && App.AppInstance.Application.Documents.Size > 0)
+        {
+          TaskDialog mainDialog = new TaskDialog("Dockable Panel Issue");
+          mainDialog.MainInstruction = "Dockable Panel Issue";
+          mainDialog.MainContent =
+              "Revit cannot properly register Dockable Panels when launched by double-clicking a Revit file. "
+              + "Please close and re-open Revit without launching a file OR open/create a new project to trigger the Speckle panel registration.";
+
 
-        if (Application.Current != null)
-          new StyletAppLoader() { Bootstrapper = Bootstrapper };
-        else
-          new DesktopUI.App(Bootstrapper);
+          // Set footer text. Footer text is usually used to link to the help document.
+          mainDialog.FooterText =
+              "<a href=\"https://github.com/specklesystems/speckle-sharp/issues/1469 \">"
+              + "Click here for more info</a>";
 
-        Bootstrapper.Start(Application.Current);
-        Bootstrapper.SetParent(app.MainWindowHandle);
+          mainDialog.Show();
+
+        }
       }
-      catch (Exception e)
+      catch (Exception ex)
       {
-        Bootstrapper = null;
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+        var td = new TaskDialog("Error");
+        td.MainContent = $"Oh no! Something went wrong while loading Speckle, please report it on the forum:\n{ex.Message}";
+        td.AddCommandLink(TaskDialogCommandLinkId.CommandLink1, "Report issue on our Community Forum");
+
+        TaskDialogResult tResult = td.Show();
+
+        if (TaskDialogResult.CommandLink1 == tResult)
+        {
+          Process.Start("https://speckle.community/");
+        }
       }
+
     }
 
-    static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
+    public static void CreateOrFocusSpeckle(bool showWindow = true)
     {
-      Assembly a = null;
-      var name = args.Name.Split(',')[0];
-      string path = Path.GetDirectoryName(typeof(App).Assembly.Location);
+      try
+      {
+
+        if (MainWindow == null)
+        {
+          var viewModel = new MainViewModel(Bindings);
+          MainWindow = new MainWindow
+          {
+            DataContext = viewModel
+          };
+
+          //massive hack: we start the avalonia main loop and stop it immediately (since it's thread blocking)
+          //to avoid an annoying error when closing revit
+          var cts = new CancellationTokenSource();
+          cts.CancelAfter(100);
+          AvaloniaApp.Run(cts.Token);
+
+        }
 
-      string assemblyFile = Path.Combine(path, name + ".dll");
 
-      if (File.Exists(assemblyFile))
-        a = Assembly.LoadFrom(assemblyFile);
+        if (showWindow)
+        {
+          MainWindow.Show();
+          MainWindow.Activate();
+
+          //required to gracefully quit avalonia and the skia processes
+          //can also be used to manually do so
+          //https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes
 
-      return a;
+
+          if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+          {
+            var parentHwnd = App.AppInstance.MainWindowHandle;
+            var hwnd = MainWindow.PlatformImpl.Handle.Handle;
+            SetWindowLongPtr(hwnd, GWL_HWNDPARENT, parentHwnd);
+          }
+        }
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+        var td = new TaskDialog("Error");
+        td.MainContent = $"Oh no! Something went wrong while loading Speckle, please report it on the forum:\n{ex.Message}";
+        td.AddCommandLink(TaskDialogCommandLinkId.CommandLink1, "Report issue on our Community Forum");
+
+        TaskDialogResult tResult = td.Show();
+
+        if (TaskDialogResult.CommandLink1 == tResult)
+        {
+          Process.Start("https://speckle.community/");
+        }
+      }
     }
+
+    private static void AppMain(Avalonia.Application app, string[] args)
+    {
+      AvaloniaApp = app;
+    }
+
+
+
+
+
   }
 
 }
diff --git a/ConnectorRevit/ConnectorRevit/Entry/SpeckleRevitCommand2.cs b/ConnectorRevit/ConnectorRevit/Entry/SpeckleRevitCommand2.cs
deleted file mode 100644
index ba2307a8e0..0000000000
--- a/ConnectorRevit/ConnectorRevit/Entry/SpeckleRevitCommand2.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Autodesk.Revit.Attributes;
-using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.ReactiveUI;
-using DesktopUI2.ViewModels;
-using DesktopUI2.Views;
-using Speckle.ConnectorRevit.UI;
-using Speckle.Core.Logging;
-
-namespace Speckle.ConnectorRevit.Entry
-{
-  [Transaction(TransactionMode.Manual)]
-  public class SpeckleRevitCommand2 : IExternalCommand
-  {
-
-    public static bool UseDockablePanel = true;
-
-    //window stuff
-    [DllImport("user32.dll", SetLastError = true)]
-    static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr value);
-    const int GWL_HWNDPARENT = -8;
-    public static Window MainWindow { get; private set; }
-    private static Avalonia.Application AvaloniaApp { get; set; }
-    //end window stuff
-
-    public static ConnectorBindingsRevit2 Bindings { get; set; }
-
-    private static Panel _panel { get; set; }
-
-
-    internal static DockablePaneId PanelId = new DockablePaneId(new Guid("{0A866FB8-8FD5-4DE8-B24B-56F4FA5B0836}"));
-
-
-    public static void InitAvalonia()
-    {
-      BuildAvaloniaApp().SetupWithoutStarting();
-    }
-
-    public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<DesktopUI2.App>()
-      .UsePlatformDetect()
-      .With(new SkiaOptions { MaxGpuResourceSizeBytes = 8096000 })
-      .With(new Win32PlatformOptions { AllowEglInitialization = true, EnableMultitouch = false })
-      .LogToTrace()
-      .UseReactiveUI();
-
-
-
-    public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
-    {
-
-      if (UseDockablePanel)
-      {
-        try
-        {
-          RegisterPane();
-          var panel = App.AppInstance.GetDockablePane(PanelId);
-          panel.Show();
-        }
-        catch (Exception ex)
-        {
-          Log.CaptureException(ex, Sentry.SentryLevel.Error);
-        }
-      }
-      else
-        CreateOrFocusSpeckle();
-
-
-
-      return Result.Succeeded;
-    }
-
-    internal static void RegisterPane()
-    {
-      try
-      {
-        if (!UseDockablePanel)
-          return;
-
-        var registered = DockablePane.PaneIsRegistered(PanelId);
-        var created = DockablePane.PaneExists(PanelId);
-
-        if (registered && created)
-        {
-          _panel.Init();
-          return;
-        }
-
-        if (!registered)
-        {
-          //Register dockable panel
-          var viewModel = new MainViewModel(Bindings);
-          _panel = new Panel
-          {
-            DataContext = viewModel
-          };
-          App.AppInstance.RegisterDockablePane(PanelId, "Speckle", _panel);
-          _panel.Init();
-        }
-        created = DockablePane.PaneExists(PanelId);
-
-        //if revit was launched double-clicking on a Revit file, we're screwed
-        //could maybe show the old window?
-        if (!created && App.AppInstance.Application.Documents.Size > 0)
-        {
-          TaskDialog mainDialog = new TaskDialog("Dockable Panel Issue");
-          mainDialog.MainInstruction = "Dockable Panel Issue";
-          mainDialog.MainContent =
-              "Revit cannot properly register Dockable Panels when launched by double-clicking a Revit file. "
-              + "Please close and re-open Revit without launching a file OR open/create a new project to trigger the Speckle panel registration.";
-
-
-          // Set footer text. Footer text is usually used to link to the help document.
-          mainDialog.FooterText =
-              "<a href=\"https://github.com/specklesystems/speckle-sharp/issues/1469 \">"
-              + "Click here for more info</a>";
-
-          mainDialog.Show();
-
-        }
-      }
-      catch (Exception ex)
-      {
-        Log.CaptureException(ex, Sentry.SentryLevel.Error);
-        var td = new TaskDialog("Error");
-        td.MainContent = $"Oh no! Something went wrong while loading Speckle, please report it on the forum:\n{ex.Message}";
-        td.AddCommandLink(TaskDialogCommandLinkId.CommandLink1, "Report issue on our Community Forum");
-
-        TaskDialogResult tResult = td.Show();
-
-        if (TaskDialogResult.CommandLink1 == tResult)
-        {
-          Process.Start("https://speckle.community/");
-        }
-      }
-
-    }
-
-    public static void CreateOrFocusSpeckle(bool showWindow = true)
-    {
-      try
-      {
-
-        if (MainWindow == null)
-        {
-          var viewModel = new MainViewModel(Bindings);
-          MainWindow = new MainWindow
-          {
-            DataContext = viewModel
-          };
-
-          //massive hack: we start the avalonia main loop and stop it immediately (since it's thread blocking)
-          //to avoid an annoying error when closing revit
-          var cts = new CancellationTokenSource();
-          cts.CancelAfter(100);
-          AvaloniaApp.Run(cts.Token);
-
-        }
-
-
-        if (showWindow)
-        {
-          MainWindow.Show();
-          MainWindow.Activate();
-
-          //required to gracefully quit avalonia and the skia processes
-          //can also be used to manually do so
-          //https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes
-
-
-          if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-          {
-            var parentHwnd = App.AppInstance.MainWindowHandle;
-            var hwnd = MainWindow.PlatformImpl.Handle.Handle;
-            SetWindowLongPtr(hwnd, GWL_HWNDPARENT, parentHwnd);
-          }
-        }
-      }
-      catch (Exception ex)
-      {
-        Log.CaptureException(ex, Sentry.SentryLevel.Error);
-        var td = new TaskDialog("Error");
-        td.MainContent = $"Oh no! Something went wrong while loading Speckle, please report it on the forum:\n{ex.Message}";
-        td.AddCommandLink(TaskDialogCommandLinkId.CommandLink1, "Report issue on our Community Forum");
-
-        TaskDialogResult tResult = td.Show();
-
-        if (TaskDialogResult.CommandLink1 == tResult)
-        {
-          Process.Start("https://speckle.community/");
-        }
-      }
-    }
-
-    private static void AppMain(Avalonia.Application app, string[] args)
-    {
-      AvaloniaApp = app;
-    }
-
-
-
-
-
-  }
-
-}
diff --git a/ConnectorRevit/ConnectorRevit/ExternalEventHandler.cs b/ConnectorRevit/ConnectorRevit/ExternalEventHandler.cs
deleted file mode 100644
index abfdcfac6a..0000000000
--- a/ConnectorRevit/ConnectorRevit/ExternalEventHandler.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Autodesk.Revit.UI;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Speckle.ConnectorRevit.UI;
-using Speckle.Core.Logging;
-using Speckle.DesktopUI;
-
-namespace Speckle.ConnectorRevit
-{
-  /// <summary>
-  /// Event invoker. Has a queue of actions that, in theory, this thing should iterate through. 
-  /// Required to run transactions form a non modal window.
-  /// </summary>
-  public class SpeckleExternalEventHandler : IExternalEventHandler
-  {
-    public ConnectorBindingsRevit RevitBindings { get; set; }
-    public bool Running = false;
-
-    public SpeckleExternalEventHandler(ConnectorBindingsRevit revitBindings)
-    {
-      RevitBindings = revitBindings;
-    }
-
-    public void Execute(UIApplication app)
-    {
-      Debug.WriteLine("Current queue length is: " + RevitBindings.Queue.Count);
-      if (Running) return; // queue will run itself through
-
-      Running = true;
-
-      try
-      {
-        RevitBindings.Queue[0]();
-      }
-      catch (Exception e)
-      {
-        Log.CaptureException(e);
-      }
-
-      RevitBindings.Queue.RemoveAt(0);
-      Running = false;
-
-      if (RevitBindings.Queue.Count != 0)
-        RevitBindings.Executor.Raise();
-
-    }
-
-    public string GetName()
-    {
-      return "ConnectorRevit";
-    }
-  }
-}
diff --git a/ConnectorRevit/ConnectorRevit/Storage/StreamStateManager.cs b/ConnectorRevit/ConnectorRevit/Storage/StreamStateManager.cs
index 5ae7a19c51..63b3253e0e 100644
--- a/ConnectorRevit/ConnectorRevit/Storage/StreamStateManager.cs
+++ b/ConnectorRevit/ConnectorRevit/Storage/StreamStateManager.cs
@@ -3,8 +3,8 @@
 
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.ExtensibleStorage;
+using DesktopUI2.Models;
 using Speckle.Newtonsoft.Json;
-using Speckle.DesktopUI.Utils;
 
 namespace Speckle.ConnectorRevit.Storage
 {
@@ -14,7 +14,7 @@ namespace Speckle.ConnectorRevit.Storage
   /// </summary>
   public static class StreamStateManager
   {
-    readonly static Guid ID = new Guid("{5D453471-1F20-44CE-B1D0-BBD2BDE4616A}");
+    readonly static Guid ID = new Guid("4EF264B9-5AA0-4B99-A6E7-C82ACEB26DE2");
 
     /// <summary>
     /// Returns all the speckle stream states present in the current document.
@@ -32,11 +32,6 @@ public static List<StreamState> ReadState(Document doc)
         var str = streamStatesEntity.Get<string>("StreamStates");
         var states = JsonConvert.DeserializeObject<List<StreamState>>(str);
 
-        if (states != null)
-        {
-          states.ForEach(x => x.Initialise(true));
-        }
-
         return states;
       }
       catch (Exception e)
@@ -57,11 +52,11 @@ public static void WriteStreamStateList(Document doc, List<StreamState> streamSt
       if (ds == null)
         ds = DataStorage.Create(doc);
 
-      var streamStatesEntity = new Entity(StreamStateListSchema.GetSchema());
+      var streamStatesEntity = new Entity(StreamStateListSchema2.GetSchema());
 
       streamStatesEntity.Set("StreamStates", JsonConvert.SerializeObject(streamStates) as string);
 
-      var idEntity = new Entity(DSUniqueSchemaStreamStateStorage.GetSchema());
+      var idEntity = new Entity(DSUniqueSchemaStreamStateStorage2.GetSchema());
       idEntity.Set("Id", ID);
 
       ds.SetEntity(idEntity);
@@ -78,7 +73,7 @@ private static DataStorage GetSettingsDataStorage(Document doc)
       // Find setting data storage
       foreach (DataStorage dataStorage in dataStorages)
       {
-        var settingIdEntity = dataStorage.GetEntity(DSUniqueSchemaStreamStateStorage.GetSchema());
+        var settingIdEntity = dataStorage.GetEntity(DSUniqueSchemaStreamStateStorage2.GetSchema());
 
         if (!settingIdEntity.IsValid())
           continue;
@@ -100,7 +95,7 @@ private static Entity GetSpeckleEntity(Document doc)
       var dataStorages = collector.OfClass(typeof(DataStorage));
       foreach (DataStorage dataStorage in dataStorages)
       {
-        Entity settingEntity = dataStorage.GetEntity(StreamStateListSchema.GetSchema());
+        Entity settingEntity = dataStorage.GetEntity(StreamStateListSchema2.GetSchema());
         if (!settingEntity.IsValid())
           continue;
 
@@ -113,9 +108,9 @@ private static Entity GetSpeckleEntity(Document doc)
   /// <summary>
   /// Revit schema of the StreamStateWrapper class.
   /// </summary>
-  public static class StreamStateListSchema
+  public static class StreamStateListSchema2
   {
-    static readonly Guid schemaGuid = new Guid("{F29ABD4E-C2DA-4F6A-A301-C70F1C32128D}");
+    static readonly Guid schemaGuid = new Guid("C48D05AE-8068-4B9A-A790-B4B2F605126B");
 
     public static Schema GetSchema()
     {
@@ -135,9 +130,9 @@ public static Schema GetSchema()
   /// <summary>
   /// Unique schema for... something ¯\_(ツ)_/¯
   /// </summary>
-  static class DSUniqueSchemaStreamStateStorage
+  static class DSUniqueSchemaStreamStateStorage2
   {
-    static readonly Guid schemaGuid = new Guid("{174C7EEE-EC5E-4A3F-894A-C801871AEDB8}");
+    static readonly Guid schemaGuid = new Guid("C0DA9F31-83A7-4775-807B-4430446E694F");
 
     public static Schema GetSchema()
     {
diff --git a/ConnectorRevit/ConnectorRevit/Storage/StreamStateManager2.cs b/ConnectorRevit/ConnectorRevit/Storage/StreamStateManager2.cs
deleted file mode 100644
index 2aacafa0eb..0000000000
--- a/ConnectorRevit/ConnectorRevit/Storage/StreamStateManager2.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Autodesk.Revit.DB;
-using Autodesk.Revit.DB.ExtensibleStorage;
-using DesktopUI2.Models;
-using Speckle.Newtonsoft.Json;
-
-namespace Speckle.ConnectorRevit.Storage
-{
-  /// <summary>
-  /// Manages the serialisation of speckle stream state
-  /// (stream info, account info, and filter type) in a revit document.
-  /// </summary>
-  public static class StreamStateManager2
-  {
-    readonly static Guid ID = new Guid("4EF264B9-5AA0-4B99-A6E7-C82ACEB26DE2");
-
-    /// <summary>
-    /// Returns all the speckle stream states present in the current document.
-    /// </summary>
-    /// <param name="doc"></param>
-    /// <returns></returns>
-    public static List<StreamState> ReadState(Document doc)
-    {
-      try
-      {
-        var streamStatesEntity = GetSpeckleEntity(doc);
-        if (streamStatesEntity == null || !streamStatesEntity.IsValid())
-          return new List<StreamState>();
-
-        var str = streamStatesEntity.Get<string>("StreamStates");
-        var states = JsonConvert.DeserializeObject<List<StreamState>>(str);
-
-        return states;
-      }
-      catch (Exception e)
-      {
-        return new List<StreamState>();
-      }
-    }
-
-    /// <summary>
-    /// Writes the stream states to the current document.
-    /// </summary>
-    /// <param name="doc"></param>
-    /// <param name="wrap"></param>
-    public static void WriteStreamStateList(Document doc, List<StreamState> streamStates)
-    {
-      var ds = GetSettingsDataStorage(doc);
-
-      if (ds == null)
-        ds = DataStorage.Create(doc);
-
-      var streamStatesEntity = new Entity(StreamStateListSchema2.GetSchema());
-
-      streamStatesEntity.Set("StreamStates", JsonConvert.SerializeObject(streamStates) as string);
-
-      var idEntity = new Entity(DSUniqueSchemaStreamStateStorage2.GetSchema());
-      idEntity.Set("Id", ID);
-
-      ds.SetEntity(idEntity);
-      ds.SetEntity(streamStatesEntity);
-    }
-
-    private static DataStorage GetSettingsDataStorage(Document doc)
-    {
-      // Retrieve all data storages from project
-      var collector = new FilteredElementCollector(doc);
-
-      var dataStorages = collector.OfClass(typeof(DataStorage));
-
-      // Find setting data storage
-      foreach (DataStorage dataStorage in dataStorages)
-      {
-        var settingIdEntity = dataStorage.GetEntity(DSUniqueSchemaStreamStateStorage2.GetSchema());
-
-        if (!settingIdEntity.IsValid())
-          continue;
-
-        var id = settingIdEntity.Get<Guid>("Id");
-
-        if (!id.Equals(ID))
-          continue;
-
-        return dataStorage;
-      }
-      return null;
-    }
-
-    private static Entity GetSpeckleEntity(Document doc)
-    {
-      FilteredElementCollector collector = new FilteredElementCollector(doc);
-
-      var dataStorages = collector.OfClass(typeof(DataStorage));
-      foreach (DataStorage dataStorage in dataStorages)
-      {
-        Entity settingEntity = dataStorage.GetEntity(StreamStateListSchema2.GetSchema());
-        if (!settingEntity.IsValid())
-          continue;
-
-        return settingEntity;
-      }
-      return null;
-    }
-  }
-
-  /// <summary>
-  /// Revit schema of the StreamStateWrapper class.
-  /// </summary>
-  public static class StreamStateListSchema2
-  {
-    static readonly Guid schemaGuid = new Guid("C48D05AE-8068-4B9A-A790-B4B2F605126B");
-
-    public static Schema GetSchema()
-    {
-      var schema = Schema.Lookup(schemaGuid);
-      if (schema != null)
-        return schema;
-
-      var builder = new SchemaBuilder(schemaGuid);
-      builder.SetSchemaName("StreamStateWrapper");
-      builder.AddSimpleField("StreamStates", typeof(string));
-
-      return builder.Finish();
-    }
-  }
-
-
-  /// <summary>
-  /// Unique schema for... something ¯\_(ツ)_/¯
-  /// </summary>
-  static class DSUniqueSchemaStreamStateStorage2
-  {
-    static readonly Guid schemaGuid = new Guid("C0DA9F31-83A7-4775-807B-4430446E694F");
-
-    public static Schema GetSchema()
-    {
-      Schema schema = Schema.Lookup(schemaGuid);
-
-      if (schema != null)
-        return schema;
-
-      SchemaBuilder schemaBuilder = new SchemaBuilder(schemaGuid);
-
-      schemaBuilder.SetSchemaName("DataStorageUniqueId");
-
-      schemaBuilder.AddSimpleField("Id", typeof(Guid));
-
-      return schemaBuilder.Finish();
-    }
-  }
-}
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2 .Settings.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit .Settings.cs
similarity index 98%
rename from ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2 .Settings.cs
rename to ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit .Settings.cs
index 2770725f6e..aaa5049df5 100644
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2 .Settings.cs	
+++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit .Settings.cs	
@@ -5,7 +5,7 @@
 
 namespace Speckle.ConnectorRevit.UI
 {
-  public partial class ConnectorBindingsRevit2
+  public partial class ConnectorBindingsRevit
   {
     // CAUTION: these strings need to have the same values as in the converter
     const string InternalOrigin = "Internal Origin (default)";
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.ClientOperations.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.ClientOperations.cs
deleted file mode 100644
index 8ada0c379f..0000000000
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.ClientOperations.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Autodesk.Revit.DB;
-using Speckle.ConnectorRevit.Storage;
-using Speckle.Core.Api;
-using Speckle.Core.Kits;
-using Speckle.Core.Logging;
-using Speckle.Core.Models;
-using Speckle.Core.Transports;
-using Speckle.DesktopUI.Utils;
-using Stylet;
-using RevitElement = Autodesk.Revit.DB.Element;
-
-namespace Speckle.ConnectorRevit.UI
-{
-  public partial class ConnectorBindingsRevit
-  {
-
-
-    public List<StreamState> DocumentStreams { get; set; } = new List<StreamState>();
-
-    [ObsoleteAttribute("This property is obsolete. Use the Report on the progress view model", false)]
-    public List<Exception> ConversionErrors { get; set; } = new List<Exception>();
-
-    /// <summary>
-    /// Keeps track of errors in the operations of send/receive.
-    /// </summary>
-    [ObsoleteAttribute("This property is obsolete. Use the Report on the progress view model", false)]
-    public List<Exception> OperationErrors { get; set; } = new List<Exception>();
-
-    public override List<StreamState> GetStreamsInFile()
-    {
-      if (CurrentDoc != null)
-        DocumentStreams = StreamStateManager.ReadState(CurrentDoc.Document);
-
-      return DocumentStreams;
-    }
-
-    #region Local file i/o
-
-    /// <summary>
-    /// Adds a new stream to the file.
-    /// </summary>
-    /// <param name="state">StreamState passed by the UI</param>
-    public override void AddNewStream(StreamState state)
-    {
-      var index = DocumentStreams.FindIndex(b => b.Stream.id == state.Stream.id);
-      if (index == -1)
-      {
-        DocumentStreams.Add(state);
-        WriteStateToFile();
-      }
-    }
-
-    /// <summary>
-    /// Removes a stream from the file.
-    /// </summary>
-    /// <param name="streamId"></param>
-    public override void RemoveStreamFromFile(string streamId)
-    {
-      var streamState = DocumentStreams.FirstOrDefault(s => s.Stream.id == streamId);
-      if (streamState != null)
-      {
-        DocumentStreams.Remove(streamState);
-        WriteStateToFile();
-      }
-    }
-
-    /// <summary>
-    /// Update the stream state and adds adds the filtered objects
-    /// </summary>
-    /// <param name="state"></param>
-    public override void PersistAndUpdateStreamInFile(StreamState state)
-    {
-      var index = DocumentStreams.FindIndex(b => b.Stream.id == state.Stream.id);
-      if (index != -1)
-      {
-        DocumentStreams[index] = state;
-        WriteStateToFile();
-      }
-    }
-
-    /// <summary>
-    /// Transaction wrapper around writing the local streams to the file.
-    /// </summary>
-    private void WriteStateToFile()
-    {
-      Queue.Add(new Action(() =>
-      {
-        using (Transaction t = new Transaction(CurrentDoc.Document, "Speckle Write State"))
-        {
-          t.Start();
-          StreamStateManager.WriteStreamStateList(CurrentDoc.Document, DocumentStreams);
-          t.Commit();
-        }
-      }));
-      Executor.Raise();
-    }
-
-    #endregion
-
-    private void UpdateProgress(ConcurrentDictionary<string, int> dict, DesktopUI.Utils.ProgressReport progress)
-    {
-      if (progress == null)
-      {
-        return;
-      }
-
-      Execute.PostToUIThread(() =>
-      {
-        progress.ProgressDict = dict;
-        progress.Value = dict.Values.Last();
-      });
-    }
-  }
-}
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Events.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Events.cs
similarity index 66%
rename from ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Events.cs
rename to ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Events.cs
index dd2832b8d2..993f736fb3 100644
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Events.cs
+++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Events.cs
@@ -7,15 +7,18 @@
 using Avalonia.Controls;
 using DesktopUI2.Models;
 using DesktopUI2.ViewModels;
+using DesktopUI2.Views;
 using DesktopUI2.Views.Windows.Dialogs;
 using Revit.Async;
 using Speckle.ConnectorRevit.Entry;
 using Speckle.ConnectorRevit.Storage;
+using Speckle.Core.Kits;
 using Speckle.Core.Logging;
+using Speckle.Core.Models;
 
 namespace Speckle.ConnectorRevit.UI
 {
-  public partial class ConnectorBindingsRevit2
+  public partial class ConnectorBindingsRevit
   {
     private string _lastSyncComment { get; set; }
     public override async void WriteStreamsToFile(List<StreamState> streams)
@@ -28,7 +31,7 @@ await RevitTask.RunAsync(
             using (Transaction t = new Transaction(CurrentDoc.Document, "Speckle Write State"))
             {
               t.Start();
-              StreamStateManager2.WriteStreamStateList(CurrentDoc.Document, streams);
+              StreamStateManager.WriteStreamStateList(CurrentDoc.Document, streams);
               t.Commit();
             }
 
@@ -88,8 +91,8 @@ private void ShowImportExportAlert()
         {
           try
           {
-            SpeckleRevitCommand2.RegisterPane();
-            var panel = App.AppInstance.GetDockablePane(SpeckleRevitCommand2.PanelId);
+            SpeckleRevitCommand.RegisterPane();
+            var panel = App.AppInstance.GetDockablePane(SpeckleRevitCommand.PanelId);
             panel.Show();
           }
           catch (Exception ex)
@@ -179,7 +182,7 @@ private void RevitApp_ViewActivated(object sender, Autodesk.Revit.UI.Events.View
         if (e.Document == null || e.PreviousActiveView == null || e.Document.GetHashCode() == e.PreviousActiveView.Document.GetHashCode())
           return;
 
-        SpeckleRevitCommand2.RegisterPane();
+        SpeckleRevitCommand.RegisterPane();
 
         var streams = GetStreamsInFile();
         UpdateSavedStreams(streams);
@@ -223,7 +226,7 @@ private void Application_DocumentChanged(object sender, Autodesk.Revit.DB.Events
     { }
     private void Application_DocumentCreated(object sender, Autodesk.Revit.DB.Events.DocumentCreatedEventArgs e)
     {
-      SpeckleRevitCommand2.RegisterPane();
+      SpeckleRevitCommand.RegisterPane();
 
       //clear saved streams if opening a new doc
       if (UpdateSavedStreams != null)
@@ -236,14 +239,14 @@ private void Application_DocumentOpened(object sender, Autodesk.Revit.DB.Events.
       var streams = GetStreamsInFile();
       if (streams != null && streams.Count != 0)
       {
-        if (SpeckleRevitCommand2.UseDockablePanel)
+        if (SpeckleRevitCommand.UseDockablePanel)
         {
-          SpeckleRevitCommand2.RegisterPane();
-          var panel = App.AppInstance.GetDockablePane(SpeckleRevitCommand2.PanelId);
+          SpeckleRevitCommand.RegisterPane();
+          var panel = App.AppInstance.GetDockablePane(SpeckleRevitCommand.PanelId);
           panel.Show();
         }
         else
-          SpeckleRevitCommand2.CreateOrFocusSpeckle();
+          SpeckleRevitCommand.CreateOrFocusSpeckle();
       }
       if (UpdateSavedStreams != null)
         UpdateSavedStreams(streams);
@@ -253,5 +256,97 @@ private void Application_DocumentOpened(object sender, Autodesk.Revit.DB.Events.
     }
 
 
+    public override bool CanOpen3DView => true;
+
+    public override async Task Open3DView(List<double> viewCoordinates, string viewName = "")
+    {
+      try
+      {
+        var views = new FilteredElementCollector(CurrentDoc.Document).OfClass(typeof(View3D)).ToElements().Cast<View3D>();
+        var viewtypes = new FilteredElementCollector(CurrentDoc.Document).OfClass(typeof(ViewFamilyType))
+          .ToElements()
+          .Cast<ViewFamilyType>()
+          .Where(x => x.ViewFamily == ViewFamily.ThreeDimensional);
+
+        //hacky but the current comments camera is not a Base object
+        //so it cannot be passed automatically to the converter
+        //making a dummy one here
+        var speckleCamera = new Base();
+        speckleCamera["isHackySpeckleCamera"] = true;
+        speckleCamera["coordinates"] = viewCoordinates;
+
+
+        //when in a perspective view, it's not possible to open any transaction (txs adsk)
+        //so we're switching to any other non perspective view here
+        if (CurrentDoc.ActiveView.ViewType == ViewType.ThreeD)
+        {
+          var activeView = CurrentDoc.ActiveView as View3D;
+          if (activeView.IsPerspective)
+          {
+            var nonPerspectiveView = views.FirstOrDefault(x => !x.IsPerspective);
+            if (nonPerspectiveView != null)
+              CurrentDoc.ActiveView = nonPerspectiveView;
+          }
+
+        }
+
+        var perspView = views.FirstOrDefault(o => o.Name == "SpeckleCommentView");
+
+        await RevitTask.RunAsync(app =>
+        {
+
+          using (var t = new Transaction(CurrentDoc.Document, $"Open Comment View"))
+          {
+            t.Start();
+
+            var converter = (ISpeckleConverter)Activator.CreateInstance(Converter.GetType());
+            converter.SetContextDocument(CurrentDoc.Document);
+            var viewOrientation3D = converter.ConvertToNative(speckleCamera) as ViewOrientation3D;
+
+            //txs bcfier
+            if (perspView == null)
+            {
+              perspView = View3D.CreatePerspective(CurrentDoc.Document, viewtypes.First().Id);
+              perspView.Name = "SpeckleCommentView";
+            }
+            perspView.SetOrientation(viewOrientation3D);
+            perspView.CropBoxActive = false;
+            perspView.CropBoxVisible = false;
+            perspView.DisplayStyle = DisplayStyle.Shading;
+
+            // the default phase was not looking good, picking the one of the View3D
+            if (views.Any())
+            {
+              var viewPhase = views.First().get_Parameter(BuiltInParameter.VIEW_PHASE);
+              if (viewPhase != null)
+              {
+                perspView.get_Parameter(BuiltInParameter.VIEW_PHASE).Set(viewPhase.AsElementId());
+              }
+            }
+
+            t.Commit();
+          }
+          // needs to be outside the transaction
+          CurrentDoc.ActiveView = perspView;
+          // "refresh" the active view, txs Connor
+          var uiView = CurrentDoc.GetOpenUIViews().FirstOrDefault(uv => uv.ViewId.Equals(perspView.Id));
+          uiView.Zoom(1);
+        });
+
+        //needed to force refresh the active view
+
+
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+        MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+        {
+          Title = "📷 Open View Error",
+          Message = $"Could not open the view: {ex.Message}",
+          Type = Avalonia.Controls.Notifications.NotificationType.Error
+        });
+      }
+    }
   }
 }
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Mappings.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Mappings.cs
similarity index 99%
rename from ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Mappings.cs
rename to ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Mappings.cs
index 3e8c3e62b8..7a093e6ea2 100644
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Mappings.cs
+++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Mappings.cs
@@ -20,7 +20,7 @@
 namespace Speckle.ConnectorRevit.UI
 {
 
-  public partial class ConnectorBindingsRevit2
+  public partial class ConnectorBindingsRevit
   {
 
     /// <summary>
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Previews.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Previews.cs
new file mode 100644
index 0000000000..78a6c0dddf
--- /dev/null
+++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Previews.cs
@@ -0,0 +1,213 @@
+using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.ExternalService;
+using Autodesk.Revit.UI;
+using Autodesk.Revit.UI.Selection;
+using DesktopUI2;
+using DesktopUI2.Models;
+using DesktopUI2.ViewModels;
+using Speckle.Core.Api;
+using Speckle.Core.Kits;
+using Speckle.Core.Logging;
+using Speckle.Core.Models;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Drawing;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using DesktopUI2.Models.Filters;
+using DesktopUI2.Models.Settings;
+using Speckle.Core.Transports;
+using Speckle.Newtonsoft.Json;
+using static DesktopUI2.ViewModels.MappingViewModel;
+using ApplicationObject = Speckle.Core.Models.ApplicationObject;
+using Avalonia.Threading;
+using Autodesk.Revit.DB.DirectContext3D;
+using Revit.Async;
+using DynamicData;
+
+namespace Speckle.ConnectorRevit.UI
+{
+  public partial class ConnectorBindingsRevit
+  {
+    public override bool CanPreviewReceive => true;
+    private string SelectedReceiveCommit { get; set; }
+    List<IDirectContext3DServer> m_servers = new List<IDirectContext3DServer>();
+
+    public override async Task<StreamState> PreviewReceive(StreamState state, ProgressViewModel progress)
+    {
+      // first check if commit is the same and preview objects have already been generated
+      Commit commit = await GetCommitFromState(state, progress);
+      progress.Report = new ProgressReport();
+
+      if (commit.id != SelectedReceiveCommit)
+      {
+        // check for converter 
+        var converter = KitManager.GetDefaultKit().LoadConverter(ConnectorRevitUtils.RevitAppName);
+        if (converter == null)
+        {
+          progress.Report.LogOperationError(new SpeckleException("Could not find any Kit!"));
+          return null;
+        }
+        converter.SetContextDocument(CurrentDoc.Document);
+
+        var settings = new Dictionary<string, string>();
+        CurrentSettings = state.Settings;
+        foreach (var setting in state.Settings)
+          settings.Add(setting.Slug, setting.Selection);
+
+        settings["preview"] = "true";
+        converter.SetConverterSettings(settings);
+
+        var commitObject = await GetCommit(commit, state, progress);
+        if (commitObject == null)
+        {
+          progress.Report.LogOperationError(new Exception($"Could not retrieve commit {commit.id} from server"));
+          progress.CancellationTokenSource.Cancel();
+        }
+
+        Preview.Clear();
+        StoredObjects.Clear();
+
+        Preview = FlattenCommitObject(commitObject, converter);
+        foreach (var previewObj in Preview)
+          progress.Report.Log(previewObj);
+
+        List<ApplicationObject> applicationObjects = null;
+        await RevitTask.RunAsync(app =>
+        {
+          using (var t = new Transaction(CurrentDoc.Document, $"Baking stream {state.StreamId}"))
+          {
+            t.Start();
+            applicationObjects = ConvertReceivedObjects(converter, progress);
+            t.Commit();
+          }
+
+          AddMultipleRevitElementServers(applicationObjects);
+        });
+      }
+      else // just generate the log
+      {
+        foreach (var previewObj in Preview)
+          progress.Report.Log(previewObj);
+      }
+      return null;
+    }
+
+    public override void ResetDocument()
+    {
+      UnregisterServers();
+    }
+
+    #region move these?
+    // gets the state commit
+    private async Task<Commit> GetCommitFromState(StreamState state, ProgressViewModel progress)
+    {
+      Commit commit = null;
+      if (state.CommitId == "latest") //if "latest", always make sure we get the latest commit
+      {
+        var res = await state.Client.BranchGet(progress.CancellationTokenSource.Token, state.StreamId, state.BranchName, 1);
+        commit = res.commits.items.FirstOrDefault();
+      }
+      else
+      {
+        var res = await state.Client.CommitGet(progress.CancellationTokenSource.Token, state.StreamId, state.CommitId);
+        commit = res;
+      }
+      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
+        return null;
+      return commit;
+    }
+    private async Task<Base> GetCommit(Commit commit, StreamState state, ProgressViewModel progress)
+    {
+      var transport = new ServerTransport(state.Client.Account, state.StreamId);
+
+      var commitObject = await Operations.Receive(
+        commit.referencedObject,
+        progress.CancellationTokenSource.Token,
+        transport,
+        onProgressAction: dict => progress.Update(dict),
+        onErrorAction: (s, e) =>
+        {
+          progress.Report.LogOperationError(e);
+          progress.CancellationTokenSource.Cancel();
+        },
+        onTotalChildrenCountKnown: (c) => progress.Max = c,
+        disposeTransports: true
+        );
+
+      if (progress.Report.OperationErrorsCount != 0)
+        return null;
+
+      return commitObject;
+    }
+    #endregion
+    public void AddMultipleRevitElementServers(List<ApplicationObject> applicationObjects)
+    {
+      ExternalService directContext3DService = ExternalServiceRegistry.GetService(ExternalServices.BuiltInExternalServices.DirectContext3DService);
+      MultiServerService msDirectContext3DService = directContext3DService as MultiServerService;
+      IList<Guid> serverIds = msDirectContext3DService.GetActiveServerIds();
+
+      foreach (var appObj in applicationObjects)
+      {
+        if (!(appObj.Converted.FirstOrDefault() is IDirectContext3DServer server))
+          continue;
+
+        directContext3DService.AddServer(server);
+        m_servers.Add(server);
+        serverIds.Add(server.GetServerId());
+        //RefreshView();
+      }
+
+      msDirectContext3DService.SetActiveServers(serverIds);
+
+      //m_documents.Add(uidoc.Document);
+      CurrentDoc.UpdateAllOpenViews();
+    }
+
+    public void UnregisterServers()
+    {
+      ExternalServiceId externalDrawerServiceId = ExternalServices.BuiltInExternalServices.DirectContext3DService;
+      var externalDrawerService = ExternalServiceRegistry.GetService(externalDrawerServiceId) as MultiServerService;
+      if (externalDrawerService == null)
+        return;
+
+      foreach (var registeredServerId in externalDrawerService.GetRegisteredServerIds())
+      {
+        var externalDrawServer = externalDrawerService.GetServer(registeredServerId) as IDirectContext3DServer;
+        if (externalDrawServer == null)
+          continue;
+        //if (document != null && !document.Equals(externalDrawServer.Document))
+        //  continue;
+        externalDrawerService.RemoveServer(registeredServerId);
+      }
+
+      m_servers.Clear();
+      CurrentDoc.UpdateAllOpenViews();
+    }
+
+    public override bool CanPreviewSend => true;
+
+    public override void PreviewSend(StreamState state, ProgressViewModel progress)
+    {
+      var filterObjs = GetSelectionFilterObjects(state.Filter);
+      foreach (var filterObj in filterObjs)
+      {
+        var converter = (ISpeckleConverter)Activator.CreateInstance(Converter.GetType());
+        var descriptor = ConnectorRevitUtils.ObjectDescriptor(filterObj);
+        var reportObj = new ApplicationObject(filterObj.UniqueId, descriptor);
+        if (!converter.CanConvertToSpeckle(filterObj))
+          reportObj.Update(status: ApplicationObject.State.Skipped, logItem: $"Sending this object type is not supported in Revit");
+        else
+          reportObj.Update(status: ApplicationObject.State.Created);
+        progress.Report.Log(reportObj);
+      }
+      SelectClientObjects(filterObjs.Select(o => o.UniqueId).ToList());
+    }
+  }
+}
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Receive.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Receive.cs
index 1c77d1e7f4..d1c2ecc63b 100644
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Receive.cs
+++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Receive.cs
@@ -3,146 +3,160 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Autodesk.Revit.DB;
-using ConnectorRevit;
+using Avalonia.Threading;
 using ConnectorRevit.Revit;
-using Speckle.ConnectorRevit.Entry;
-using Speckle.ConnectorRevit.Storage;
+using DesktopUI2.Models;
+using DesktopUI2.Models.Settings;
+using DesktopUI2.ViewModels;
+using Revit.Async;
 using Speckle.Core.Api;
 using Speckle.Core.Kits;
-using Speckle.Core.Logging;
 using Speckle.Core.Models;
 using Speckle.Core.Transports;
-using Speckle.DesktopUI.Utils;
-using Stylet;
-using RevitElement = Autodesk.Revit.DB.Element;
 
 namespace Speckle.ConnectorRevit.UI
 {
+  
   public partial class ConnectorBindingsRevit
   {
+    public List<ApplicationObject> Preview { get; set; } = new List<ApplicationObject>();
+    public Dictionary<string, Base> StoredObjects = new Dictionary<string, Base>();
 
     /// <summary>
     /// Receives a stream and bakes into the existing revit file.
     /// </summary>
     /// <param name="state"></param>
     /// <returns></returns>
-    public override async Task<StreamState> ReceiveStream(StreamState state)
+    /// 
+    public override async Task<StreamState> ReceiveStream(StreamState state, ProgressViewModel progress)
     {
-      ConversionErrors.Clear();
-      OperationErrors.Clear();
-
-      var kit = KitManager.GetDefaultKit();
-      var converter = kit.LoadConverter(ConnectorRevitUtils.RevitAppName);
+      //make sure to instance a new copy so all values are reset correctly
+      var converter = (ISpeckleConverter)Activator.CreateInstance(Converter.GetType());
       converter.SetContextDocument(CurrentDoc.Document);
       var previouslyReceiveObjects = state.ReceivedObjects;
 
-      var transport = new ServerTransport(state.Client.Account, state.Stream.id);
+      // set converter settings as tuples (setting slug, setting selection)
+      var settings = new Dictionary<string, string>();
+      CurrentSettings = state.Settings;
+      foreach (var setting in state.Settings)
+        settings.Add(setting.Slug, setting.Selection);
+      converter.SetConverterSettings(settings);
 
-      string referencedObject = state.Commit.referencedObject;
+      var transport = new ServerTransport(state.Client.Account, state.StreamId);
 
-      if (state.CancellationTokenSource.Token.IsCancellationRequested)
-      {
+      var stream = await state.Client.StreamGet(state.StreamId);
+
+      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
         return null;
-      }
 
+      Commit myCommit = null;
       //if "latest", always make sure we get the latest commit when the user clicks "receive"
-      if (state.Commit.id == "latest")
+      if (state.CommitId == "latest")
       {
-        var res = await state.Client.BranchGet(state.CancellationTokenSource.Token, state.Stream.id, state.Branch.name, 1);
-        referencedObject = res.commits.items.FirstOrDefault().referencedObject;
+        var res = await state.Client.BranchGet(progress.CancellationTokenSource.Token, state.StreamId, state.BranchName, 1);
+        myCommit = res.commits.items.FirstOrDefault();
       }
+      else
+      {
+        myCommit = await state.Client.CommitGet(progress.CancellationTokenSource.Token, state.StreamId, state.CommitId);
+      }
+
+      state.LastSourceApp = myCommit.sourceApplication;
 
-      var commit = state.Commit;
+      string referencedObject = myCommit.referencedObject;
 
       var commitObject = await Operations.Receive(
           referencedObject,
-          state.CancellationTokenSource.Token,
+          progress.CancellationTokenSource.Token,
           transport,
-          onProgressAction: dict => UpdateProgress(dict, state.Progress),
+          onProgressAction: dict => progress.Update(dict),
           onErrorAction: (s, e) =>
           {
-            OperationErrors.Add(e);
-            state.Errors.Add(e);
-            state.CancellationTokenSource.Cancel();
+            progress.Report.LogOperationError(e);
+            progress.CancellationTokenSource.Cancel();
           },
-          onTotalChildrenCountKnown: count => Execute.PostToUIThread(() => state.Progress.Maximum = count),
+          onTotalChildrenCountKnown: count => { progress.Max = count; },
           disposeTransports: true
           );
 
-      if (OperationErrors.Count != 0)
+      try
       {
-        Globals.Notify("Failed to get commit.");
-        return state;
+        await state.Client.CommitReceived(new CommitReceivedInput
+        {
+          streamId = stream?.id,
+          commitId = myCommit?.id,
+          message = myCommit?.message,
+          sourceApplication = ConnectorRevitUtils.RevitAppName
+        });
       }
-
-      if (state.CancellationTokenSource.Token.IsCancellationRequested)
+      catch
       {
+        // Do nothing!
+      }
+
+      if (progress.Report.OperationErrorsCount != 0)
+        return state;
+
+      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
         return null;
+
+      Preview.Clear();
+      StoredObjects.Clear();
+
+
+      Preview = FlattenCommitObject(commitObject, converter);
+      foreach (var previewObj in Preview)
+        progress.Report.Log(previewObj);
+
+      converter.ReceiveMode = state.ReceiveMode;
+      // needs to be set for editing to work 
+      converter.SetPreviousContextObjects(previouslyReceiveObjects);
+      // needs to be set for openings in floors and roofs to work
+      converter.SetContextObjects(Preview);
+
+      try
+      {
+        await RevitTask.RunAsync(() => UpdateForCustomMapping(state, progress, myCommit.sourceApplication));
+      }
+      catch (Exception ex)
+      {
+        progress.Report.LogOperationError(new Exception("Could not update receive object with user types. Using default mapping."));
       }
 
-      // Bake the new ones.
-      Queue.Add(() =>
+      await RevitTask.RunAsync(app =>
       {
-        using (var t = new Transaction(CurrentDoc.Document, $"Baking stream {state.Stream.name}"))
+        using (var t = new Transaction(CurrentDoc.Document, $"Baking stream {state.StreamId}"))
         {
           var failOpts = t.GetFailureHandlingOptions();
           failOpts.SetFailuresPreprocessor(new ErrorEater(converter));
           failOpts.SetClearAfterRollback(true);
           t.SetFailureHandlingOptions(failOpts);
-
           t.Start();
-          var flattenedObjects = FlattenCommitObject(commitObject, converter);
-          // needs to be set for editing to work 
-          converter.SetPreviousContextObjects(previouslyReceiveObjects);
-          // needs to be set for openings in floors and roofs to work
-          converter.SetContextObjects(flattenedObjects.Select(x => new ApplicationObject(x.id, ConnectorRevitUtils.SimplifySpeckleType(x.speckle_type)) { applicationId = x.applicationId }).ToList());
-          var newPlaceholderObjects = ConvertReceivedObjects(flattenedObjects, converter, state);
+          
+          var newPlaceholderObjects = ConvertReceivedObjects(converter, progress);
           // receive was cancelled by user
           if (newPlaceholderObjects == null)
           {
-            converter.Report.LogConversionError(new Exception("fatal error: receive cancelled by user"));
+            progress.Report.LogOperationError(new Exception("fatal error: receive cancelled by user"));
             t.RollBack();
             return;
           }
 
-          DeleteObjects(previouslyReceiveObjects, newPlaceholderObjects);
+          if (state.ReceiveMode == ReceiveMode.Update)
+            DeleteObjects(previouslyReceiveObjects, newPlaceholderObjects);
 
           state.ReceivedObjects = newPlaceholderObjects;
 
           t.Commit();
-
-          state.Errors.AddRange(converter.Report.ConversionErrors);
         }
 
       });
 
-      Executor.Raise();
-
-      while (Queue.Count > 0)
-      {
-        //wait to let queue finish
-      }
-
-      if (converter.Report.ConversionErrorsString.Contains("fatal error"))
-      {
-        // the commit is being rolled back
-        return null;
-      }
-
-      try
-      {
-        await state.RefreshStream();
-
-        WriteStateToFile();
-      }
-      catch (Exception e)
-      {
-        WriteStateToFile();
-        state.Errors.Add(e);
-        Globals.Notify($"Receiving done, but failed to update stream from server.\n{e.Message}");
-      }
+      if (converter.Report.OperationErrors.Any(x => x.Message.Contains("fatal error")))
+        return null; // the commit is being rolled back
 
       return state;
     }
@@ -152,7 +166,7 @@ private void DeleteObjects(List<ApplicationObject> previouslyReceiveObjects, Lis
     {
       foreach (var obj in previouslyReceiveObjects)
       {
-        if (newPlaceholderObjects.Any(x => x.applicationId == obj.applicationId))
+        if (obj.CreatedIds.Count == 0 || newPlaceholderObjects.Any(x => x.applicationId == obj.applicationId))
           continue;
 
         var element = CurrentDoc.Document.GetElement(obj.CreatedIds.FirstOrDefault());
@@ -161,15 +175,20 @@ private void DeleteObjects(List<ApplicationObject> previouslyReceiveObjects, Lis
       }
     }
 
-    private List<ApplicationObject> ConvertReceivedObjects(List<Base> objects, ISpeckleConverter converter, StreamState state)
+    private List<ApplicationObject> ConvertReceivedObjects(ISpeckleConverter converter, ProgressViewModel progress)
     {
       var placeholders = new List<ApplicationObject>();
       var conversionProgressDict = new ConcurrentDictionary<string, int>();
       conversionProgressDict["Conversion"] = 1;
 
-      foreach (var @base in objects)
+      // Get setting to skip linked model elements if necessary
+      var receiveLinkedModelsSetting = CurrentSettings.FirstOrDefault(x => x.Slug == "linkedmodels-receive") as CheckBoxSetting;
+      var receiveLinkedModels = receiveLinkedModelsSetting != null ? receiveLinkedModelsSetting.IsChecked : false;
+
+      foreach (var obj in Preview)
       {
-        if (state.CancellationTokenSource.Token.IsCancellationRequested)
+        var @base = StoredObjects[obj.OriginalId];
+        if (progress.CancellationTokenSource.Token.IsCancellationRequested)
         {
           placeholders = null;
           break;
@@ -178,51 +197,78 @@ private List<ApplicationObject> ConvertReceivedObjects(List<Base> objects, ISpec
         try
         {
           conversionProgressDict["Conversion"]++;
-          // wrapped in a dispatcher not to block the ui
-          SpeckleRevitCommand.Bootstrapper.RootWindow.Dispatcher.Invoke(() =>
-          {
-            UpdateProgress(conversionProgressDict, state.Progress);
-          }, System.Windows.Threading.DispatcherPriority.Background);
+          progress.Update(conversionProgressDict);
+
+          var s = new CancellationTokenSource();
+          DispatcherTimer.RunOnce(() => s.Cancel(), TimeSpan.FromMilliseconds(10));
+          Dispatcher.UIThread.MainLoop(s.Token);
+
+          //skip element if is from a linked file and setting is off
+          if (!receiveLinkedModels && @base["isRevitLinkedModel"] != null && bool.Parse(@base["isRevitLinkedModel"].ToString()))
+            continue;
 
           var convRes = converter.ConvertToNative(@base);
-          if (convRes is ApplicationObject placeholder)
-            placeholders.Add(placeholder);
-          else if (convRes is List<ApplicationObject> placeholderList)
-            placeholders.AddRange(placeholderList);
+          RefreshView();
+
+          switch (convRes)
+          {
+            case ApplicationObject o:
+              placeholders.Add(o);
+              obj.Update(status: o.Status, createdIds: o.CreatedIds, converted: o.Converted, log: o.Log);
+              progress.Report.UpdateReportObject(obj);
+              break;
+            default:
+              break;
+          }
         }
         catch (Exception e)
         {
-          state.Errors.Add(e);
+          obj.Update(status: ApplicationObject.State.Failed, logItem: e.Message);
+          progress.Report.UpdateReportObject(obj);
         }
       }
 
       return placeholders;
     }
 
+    private void RefreshView()
+    {
+      //regenerate the document and then implement a hack to "refresh" the view
+      CurrentDoc.Document.Regenerate();
+
+      // get the active ui view
+      var view = CurrentDoc.ActiveGraphicalView ?? CurrentDoc.Document.ActiveView;
+      var uiView = CurrentDoc.GetOpenUIViews().FirstOrDefault(uv => uv.ViewId.Equals(view.Id));
+
+      // "refresh" the active view
+      uiView.Zoom(1);
+    }
+
     /// <summary>
     /// Recurses through the commit object and flattens it. 
     /// </summary>
     /// <param name="obj"></param>
     /// <param name="converter"></param>
     /// <returns></returns>
-    private List<Base> FlattenCommitObject(object obj, ISpeckleConverter converter)
+    private List<ApplicationObject> FlattenCommitObject(object obj, ISpeckleConverter converter)
     {
-      List<Base> objects = new List<Base>();
+      var objects = new List<ApplicationObject>();
 
       if (obj is Base @base)
       {
+        var appObj = new ApplicationObject(@base.id, ConnectorRevitUtils.SimplifySpeckleType(@base.speckle_type)) { applicationId = @base.applicationId, Status = ApplicationObject.State.Unknown };
+
         if (converter.CanConvertToNative(@base))
         {
-          objects.Add(@base);
-
+          appObj.Convertible = true;
+          objects.Add(appObj);
+          StoredObjects.Add(@base.id, @base);
           return objects;
         }
         else
         {
           foreach (var prop in @base.GetDynamicMembers())
-          {
             objects.AddRange(FlattenCommitObject(@base[prop], converter));
-          }
           return objects;
         }
       }
@@ -230,21 +276,27 @@ private List<Base> FlattenCommitObject(object obj, ISpeckleConverter converter)
       if (obj is List<object> list)
       {
         foreach (var listObj in list)
-        {
           objects.AddRange(FlattenCommitObject(listObj, converter));
-        }
         return objects;
       }
 
       if (obj is IDictionary dict)
       {
         foreach (DictionaryEntry kvp in dict)
-        {
           objects.AddRange(FlattenCommitObject(kvp.Value, converter));
-        }
         return objects;
       }
 
+      else
+      {
+        if (obj != null && !obj.GetType().IsPrimitive && !(obj is string))
+        {
+          var appObj = new ApplicationObject(obj.GetHashCode().ToString(), obj.GetType().ToString());
+          appObj.Update(status: ApplicationObject.State.Skipped, logItem: $"Receiving this object type is not supported in Revit");
+          objects.Add(appObj);
+        }
+      }
+
       return objects;
     }
   }
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Selection.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Selection.cs
index 409d9cab2b..619ae58c01 100644
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Selection.cs
+++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Selection.cs
@@ -1,33 +1,22 @@
 using System;
-using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Autodesk.Revit.DB;
 using ConnectorRevit;
-using Speckle.ConnectorRevit.Storage;
-using Speckle.Core.Api;
-using Speckle.Core.Kits;
+using DesktopUI2.Models.Filters;
+using DesktopUI2.Models.Settings;
 using Speckle.Core.Logging;
-using Speckle.Core.Models;
-using Speckle.Core.Transports;
-using Speckle.DesktopUI.Utils;
-using Stylet;
-using RevitElement = Autodesk.Revit.DB.Element;
 
 namespace Speckle.ConnectorRevit.UI
 {
   public partial class ConnectorBindingsRevit
   {
-
-
-    //TODO: store these string values in something more solid to avoid typos?
     public override List<ISelectionFilter> GetSelectionFilters()
     {
       var categories = new List<string>();
       var parameters = new List<string>();
       var views = new List<string>();
+      var worksets = new List<string>();
       var projectInfo = new List<string> { "Project Info", "Levels", "Views 2D", "Views 3D", "Families & Types" };
 
       if (CurrentDoc != null)
@@ -36,25 +25,32 @@ public override List<ISelectionFilter> GetSelectionFilters()
         categories = ConnectorRevitUtils.GetCategoryNames(CurrentDoc.Document);
         parameters = ConnectorRevitUtils.GetParameterNames(CurrentDoc.Document);
         views = ConnectorRevitUtils.GetViewNames(CurrentDoc.Document);
+        worksets = ConnectorRevitUtils.GetWorksets(CurrentDoc.Document);
       }
 
-      return new List<ISelectionFilter>
+      var filters = new List<ISelectionFilter>
       {
-        new ListSelectionFilter {Slug="category", Name = "Cat", Icon = "Category", Values = categories, Description="Adds all objects belonging to the selected categories"},
+         new AllSelectionFilter {Slug="all",  Name = "Everything", Icon = "CubeScan", Description = "Sends all supported elements and project information." },
+        new ManualSelectionFilter(),
+        new ListSelectionFilter {Slug="category", Name = "Category", Icon = "Category", Values = categories, Description="Adds all elements belonging to the selected categories"},
         new ListSelectionFilter {Slug="view", Name = "View", Icon = "RemoveRedEye", Values = views, Description="Adds all objects visible in the selected views" },
-        new ListSelectionFilter {Slug="project-info", Name = "P. Info", Icon = "Information", Values = projectInfo, Description="Adds the selected project information such as levels, views and family names to the stream"},
-        new PropertySelectionFilter
+        new ListSelectionFilter {Slug="project-info", Name = "Project Information", Icon = "Information", Values = projectInfo, Description="Adds the selected project information such as levels, views and family names to the stream"},
+          new PropertySelectionFilter
         {
           Slug="param",
-          Name = "Param",
-          Description="Adds  all objects satisfying the selected parameter",
+          Name = "Parameter",
+          Description="Adds all objects satisfying the selected parameter",
           Icon = "FilterList",
-          HasCustomProperty = false,
           Values = parameters,
           Operators = new List<string> {"equals", "contains", "is greater than", "is less than"}
-        },
-        new AllSelectionFilter {Slug="all",  Name = "All", Icon = "CubeScan", Description = "Selects all document objects and project information." }
+        }
+
       };
+      if (worksets.Any())
+        filters.Insert(4, new ListSelectionFilter { Slug = "workset", Name = "Workset", Icon = "Group", Values = worksets, Description = "Adds all elements belonging to the selected workset" });
+
+
+      return filters;
     }
 
     public override List<string> GetSelectedObjects()
@@ -81,133 +77,237 @@ public override List<string> GetObjectsInView()
       return elementIds;
     }
 
+    public override void SelectClientObjects(List<string> args, bool deselect = false)
+    {
+      var selection = args.Select(x => CurrentDoc.Document.GetElement(x))?.Where(x => x != null)?.Select(x => x.Id)?.ToList();
+      if (selection != null)
+      {
+        if (!deselect)
+        {
+          var currentSelection = CurrentDoc.Selection.GetElementIds().ToList();
+          if (currentSelection != null) currentSelection.AddRange(selection);
+          else currentSelection = selection;
+          try
+          {
+            CurrentDoc.Selection.SetElementIds(currentSelection);
+            CurrentDoc.ShowElements(currentSelection);
+          }
+          catch (Exception e) { }
+        }
+        else
+        {
+          var updatedSelection = CurrentDoc.Selection.GetElementIds().Where(x => !selection.Contains(x)).ToList();
+          CurrentDoc.Selection.SetElementIds(updatedSelection);
+          if (updatedSelection.Any()) CurrentDoc.ShowElements(updatedSelection);
+        }
+      }
+    }
+
+    private List<Document> GetLinkedDocuments()
+    {
+      var docs = new List<Document>();
+
+      // Get settings and return empty list if we should not send linked models
+      var sendLinkedModels = CurrentSettings?.FirstOrDefault(x => x.Slug == "linkedmodels-send") as CheckBoxSetting;
+      if (sendLinkedModels == null || !sendLinkedModels.IsChecked)
+        return docs;
+
+
+      //TODO: is the name the most safe way to look for it?
+      var linkedRVTs = new FilteredElementCollector(CurrentDoc.Document).OfCategory(BuiltInCategory.OST_RvtLinks).OfClass(typeof(RevitLinkType)).ToElements().Cast<RevitLinkType>().Select(x => x.Name.Replace(".rvt", ""));
+      foreach (Document revitDoc in RevitApp.Application.Documents)
+      {
+        if (revitDoc.IsLinked && linkedRVTs.Contains(revitDoc.Title))
+        {
+          docs.Add(revitDoc);
+        }
+      }
+
+      return docs;
+    }
+
     /// <summary>
     /// Given the filter in use by a stream returns the document elements that match it.
     /// </summary>
     /// <param name="filter"></param>
     /// <returns></returns>
-    private List<Element> GetSelectionFilterObjects(ISelectionFilter filter, ISpeckleConverter converter)
+    private List<Element> GetSelectionFilterObjects(ISelectionFilter filter)
     {
-      var doc = CurrentDoc.Document;
+      var currentDoc = CurrentDoc.Document;
+      var allDocs = GetLinkedDocuments();
+      allDocs.Add(currentDoc);
 
       var selection = new List<Element>();
-
-      switch (filter.Slug)
+      try
       {
-        case "all":
-          selection.AddRange(doc.SupportedElements()); // includes levels
-          selection.Add(doc.ProjectInformation);
-          selection.AddRange(doc.Views2D());
-          selection.AddRange(doc.Views3D());
-          selection.AddRange(doc.SupportedTypes());
-          return selection;
-
-        case "category":
-          var catFilter = filter as ListSelectionFilter;
-          var bics = new List<BuiltInCategory>();
-          var categories = ConnectorRevitUtils.GetCategories(doc);
-          IList<ElementFilter> elementFilters = new List<ElementFilter>();
-
-          foreach (var cat in catFilter.Selection)
-          {
-            elementFilters.Add(new ElementCategoryFilter(categories[cat].Id));
-          }
 
-          var categoryFilter = new LogicalOrFilter(elementFilters);
+        switch (filter.Slug)
+        {
+
+          case "manual":
+            selection = filter.Selection.Select(x => CurrentDoc.Document.GetElement(x)).Where(x => x != null).ToList();
+            var linkedFiles = selection.Where(x => x is RevitLinkInstance).Cast<RevitLinkInstance>().ToList();
+
+            foreach (var linkedFile in linkedFiles)
+            {
+              var match = allDocs.FirstOrDefault(x => x.Title == linkedFile.Name.Split(new string[] { ".rvt" }, StringSplitOptions.None)[0]);
+              if (match != null)
+                selection.AddRange(match.SupportedElements());
+            }
+
+            return selection;
+
+          case "all":
+            //add these only for the current doc
+            selection.Add(currentDoc.ProjectInformation);
+            selection.AddRange(currentDoc.Views2D());
+            selection.AddRange(currentDoc.Views3D());
 
-          selection = new FilteredElementCollector(doc)
-            .WhereElementIsNotElementType()
-            .WhereElementIsViewIndependent()
-            .WherePasses(categoryFilter).ToList();
-          return selection;
+            //and these for every linked doc
+            foreach (var doc in allDocs)
+            {
+              selection.AddRange(doc.SupportedElements()); // includes levels
+              selection.AddRange(doc.SupportedTypes());
+            }
 
-        case "view":
-          var viewFilter = filter as ListSelectionFilter;
+            return selection;
 
-          var views = new FilteredElementCollector(doc)
-            .WhereElementIsNotElementType()
-            .OfClass(typeof(View))
-            .Where(x => viewFilter.Selection.Contains(x.Name));
+          case "category":
+            var catFilter = filter as ListSelectionFilter;
+            var bics = new List<BuiltInCategory>();
+            var categories = ConnectorRevitUtils.GetCategories(currentDoc);
+            IList<ElementFilter> elementFilters = new List<ElementFilter>();
 
-          foreach (var view in views)
-          {
-            var ids = selection.Select(x => x.UniqueId);
+            foreach (var cat in catFilter.Selection)
+            {
+              elementFilters.Add(new ElementCategoryFilter(categories[cat].Id));
+            }
+
+            var categoryFilter = new LogicalOrFilter(elementFilters);
+            foreach (var doc in allDocs)
+            {
+              selection.AddRange(new FilteredElementCollector(doc)
+             .WhereElementIsNotElementType()
+             .WhereElementIsViewIndependent()
+             .WherePasses(categoryFilter).ToList());
+            }
 
-            var viewElements = new FilteredElementCollector(doc, view.Id)
+            return selection;
+
+          case "view":
+            var viewFilter = filter as ListSelectionFilter;
+
+            var views = new FilteredElementCollector(currentDoc)
               .WhereElementIsNotElementType()
-              .WhereElementIsViewIndependent()
-              .Where(x => x.IsPhysicalElement())
-              .Where(x => !ids.Contains(x.UniqueId)) //exclude elements already added from other views
-              .ToList();
+              .OfClass(typeof(View))
+              .Where(x => viewFilter.Selection.Contains(x.Name));
 
-            selection.AddRange(viewElements);
-          }
-          return selection;
+            foreach (var view in views)
+            {
+              var ids = selection.Select(x => x.UniqueId);
+
+              foreach (var doc in allDocs)
+              {
+                selection.AddRange(new FilteredElementCollector(doc, view.Id)
+                .WhereElementIsNotElementType()
+                .WhereElementIsViewIndependent()
+                //.Where(x => x.IsPhysicalElement())
+                .Where(x => !ids.Contains(x.UniqueId)) //exclude elements already added from other views
+                .ToList());
+              }
+            }
+            return selection;
 
-        case "project-info":
-          var projectInfoFilter = filter as ListSelectionFilter;
+          case "project-info":
+            var projectInfoFilter = filter as ListSelectionFilter;
 
-          if (projectInfoFilter.Selection.Contains("Project Info"))
-            selection.Add(doc.ProjectInformation);
+            if (projectInfoFilter.Selection.Contains("Project Info"))
+              selection.Add(currentDoc.ProjectInformation);
 
-          if (projectInfoFilter.Selection.Contains("Views 2D"))
-            selection.AddRange(doc.Views2D());
+            if (projectInfoFilter.Selection.Contains("Views 2D"))
+              selection.AddRange(currentDoc.Views2D());
 
-          if (projectInfoFilter.Selection.Contains("Views 3D"))
-            selection.AddRange(doc.Views3D());
+            if (projectInfoFilter.Selection.Contains("Views 3D"))
+              selection.AddRange(currentDoc.Views3D());
 
-          if (projectInfoFilter.Selection.Contains("Levels"))
-            selection.AddRange(doc.Levels());
+            if (projectInfoFilter.Selection.Contains("Levels"))
+              selection.AddRange(currentDoc.Levels());
 
-          if (projectInfoFilter.Selection.Contains("Families & Types"))
-            selection.AddRange(doc.SupportedTypes());
+            if (projectInfoFilter.Selection.Contains("Families & Types"))
+              selection.AddRange(currentDoc.SupportedTypes());
 
-          return selection;
+            return selection;
 
-        case "param":
-          try
-          {
-            var propFilter = filter as PropertySelectionFilter;
-            var query = new FilteredElementCollector(doc)
-              .WhereElementIsNotElementType()
-              .WhereElementIsNotElementType()
-              .WhereElementIsViewIndependent()
-              .Where(x => x.IsPhysicalElement())
-              .Where(fi => fi.LookupParameter(propFilter.PropertyName) != null);
+          case "workset":
+            var worksetFilter = filter as ListSelectionFilter;
+            var worksets = new FilteredWorksetCollector(currentDoc).Where(x => worksetFilter.Selection.Contains(x.Name)).Select(x => x.Id).ToList();
+            foreach (var doc in allDocs)
+            {
+              var collector = new FilteredElementCollector(doc);
+              var elementWorksetFilters = new List<ElementFilter>();
 
-            propFilter.PropertyValue = propFilter.PropertyValue.ToLowerInvariant();
+              foreach (var w in worksets)
+              {
+                elementWorksetFilters.Add(new ElementWorksetFilter(w));
+              }
+
+              var worksetLogicalFilter = new LogicalOrFilter(elementWorksetFilters);
+              selection.AddRange(collector.WherePasses(worksetLogicalFilter).ToElements().ToList());
+            }
+            return selection;
 
-            switch (propFilter.PropertyOperator)
+          case "param":
+            try
             {
-              case "equals":
-                query = query.Where(fi =>
-                  GetStringValue(fi.LookupParameter(propFilter.PropertyName)) == propFilter.PropertyValue);
-                break;
-              case "contains":
-                query = query.Where(fi =>
-                  GetStringValue(fi.LookupParameter(propFilter.PropertyName)).Contains(propFilter.PropertyValue));
-                break;
-              case "is greater than":
-                query = query.Where(fi => RevitVersionHelper.ConvertFromInternalUnits(
-                                            fi.LookupParameter(propFilter.PropertyName).AsDouble(),
-                                            fi.LookupParameter(propFilter.PropertyName)) >
-                                          double.Parse(propFilter.PropertyValue));
-                break;
-              case "is less than":
-                query = query.Where(fi => RevitVersionHelper.ConvertFromInternalUnits(
-                                            fi.LookupParameter(propFilter.PropertyName).AsDouble(),
-                                            fi.LookupParameter(propFilter.PropertyName)) <
-                                          double.Parse(propFilter.PropertyValue));
-                break;
+              foreach (var doc in allDocs)
+              {
+                var propFilter = filter as PropertySelectionFilter;
+                var query = new FilteredElementCollector(doc)
+                  .WhereElementIsNotElementType()
+                  .WhereElementIsNotElementType()
+                  .WhereElementIsViewIndependent()
+                  .Where(x => x.IsPhysicalElement())
+                  .Where(fi => fi.LookupParameter(propFilter.PropertyName) != null);
+
+                propFilter.PropertyValue = propFilter.PropertyValue.ToLowerInvariant();
+
+                switch (propFilter.PropertyOperator)
+                {
+                  case "equals":
+                    query = query.Where(fi =>
+                      GetStringValue(fi.LookupParameter(propFilter.PropertyName)) == propFilter.PropertyValue);
+                    break;
+                  case "contains":
+                    query = query.Where(fi =>
+                      GetStringValue(fi.LookupParameter(propFilter.PropertyName)).Contains(propFilter.PropertyValue));
+                    break;
+                  case "is greater than":
+                    query = query.Where(fi => RevitVersionHelper.ConvertFromInternalUnits(
+                                                fi.LookupParameter(propFilter.PropertyName).AsDouble(),
+                                                fi.LookupParameter(propFilter.PropertyName)) >
+                                              double.Parse(propFilter.PropertyValue));
+                    break;
+                  case "is less than":
+                    query = query.Where(fi => RevitVersionHelper.ConvertFromInternalUnits(
+                                                fi.LookupParameter(propFilter.PropertyName).AsDouble(),
+                                                fi.LookupParameter(propFilter.PropertyName)) <
+                                              double.Parse(propFilter.PropertyValue));
+                    break;
+                }
+
+                selection.AddRange(query.ToList());
+              }
             }
+            catch (Exception e)
+            {
+              Log.CaptureException(e);
+            }
+            return selection;
+        }
+      }
+      catch (Exception e)
+      {
 
-            selection = query.ToList();
-          }
-          catch (Exception e)
-          {
-            Log.CaptureException(e);
-          }
-          return selection;
       }
 
       return selection;
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Send.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Send.cs
index 57a16df910..c1aeaf5bfd 100644
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Send.cs
+++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Send.cs
@@ -1,180 +1,257 @@
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Autodesk.Revit.DB;
-using Speckle.ConnectorRevit.Storage;
+using Avalonia.Threading;
+using DesktopUI2.Models;
+using DesktopUI2.Models.Settings;
+using DesktopUI2.ViewModels;
+using Revit.Async;
 using Speckle.Core.Api;
 using Speckle.Core.Kits;
-using Speckle.Core.Logging;
 using Speckle.Core.Models;
 using Speckle.Core.Transports;
-using Speckle.DesktopUI.Utils;
-using Stylet;
 
 namespace Speckle.ConnectorRevit.UI
 {
   public partial class ConnectorBindingsRevit
   {
+    // used to store the Stream State settings when sending/receiving
+    private List<ISetting> CurrentSettings { get; set; }
+
     /// <summary>
     /// Converts the Revit elements that have been added to the stream by the user, sends them to
     /// the Server and the local DB, and creates a commit with the objects.
     /// </summary>
     /// <param name="state">StreamState passed by the UI</param>
-    public override async Task<StreamState> SendStream(StreamState state)
+    public override async Task<string> SendStream(StreamState state, ProgressViewModel progress)
     {
-      ConversionErrors.Clear();
-      OperationErrors.Clear();
-
-      var kit = KitManager.GetDefaultKit();
-      var converter = kit.LoadConverter(ConnectorRevitUtils.RevitAppName);
+      //make sure to instance a new copy so all values are reset correctly
+      var converter = (ISpeckleConverter)Activator.CreateInstance(Converter.GetType());
       converter.SetContextDocument(CurrentDoc.Document);
+      converter.Report.ReportObjects.Clear();
+
+      // set converter settings as tuples (setting slug, setting selection)
+      var settings = new Dictionary<string, string>();
+      CurrentSettings = state.Settings;
+      foreach (var setting in state.Settings)
+        settings.Add(setting.Slug, setting.Selection);
+      converter.SetConverterSettings(settings);
 
-      var streamId = state.Stream.id;
+      var streamId = state.StreamId;
       var client = state.Client;
 
-      var selectedObjects = new List<Element>();
-
-      if (state.Filter != null)
-      {
-        selectedObjects = GetSelectionFilterObjects(state.Filter, converter);
-        state.SelectedObjectIds = selectedObjects.Select(x => x.UniqueId).ToList();
-      }
-      else //selection was by cursor
-      {
-        // TODO: update state by removing any deleted or null object ids
-        selectedObjects = state.SelectedObjectIds.Select(x => CurrentDoc.Document.GetElement(x)).Where(x => x != null).ToList();
-      }
+      var selectedObjects = GetSelectionFilterObjects(state.Filter);
+      state.SelectedObjectIds = selectedObjects.Select(x => x.UniqueId).ToList();
 
       if (!selectedObjects.Any())
       {
-        state.Errors.Add(new Exception("There are zero objects to send. Please use a filter, or set some via selection."));
-        return state;
+        progress.Report.LogOperationError(new Exception("There are zero objects to send. Please use a filter, or set some via selection."));
+        return null;
       }
 
       converter.SetContextObjects(selectedObjects.Select(x => new ApplicationObject(x.UniqueId, x.GetType().ToString()) { applicationId = x.UniqueId }).ToList());
-
-      var commitObject = new Base();
+      var commitObject = converter.ConvertToSpeckle(CurrentDoc.Document) ?? new Base();
 
       var conversionProgressDict = new ConcurrentDictionary<string, int>();
       conversionProgressDict["Conversion"] = 0;
-      Execute.PostToUIThread(() => state.Progress.Maximum = selectedObjects.Count());
+
+      progress.Max = selectedObjects.Count();
       var convertedCount = 0;
 
-      var placeholders = new List<Base>();
-      foreach (var revitElement in selectedObjects)
+      var cancelSend = await RevitTask.RunAsync(app =>
       {
-        try
+        foreach (var revitElement in selectedObjects)
         {
-          if (revitElement == null)
-            continue;
-
-          if (!converter.CanConvertToSpeckle(revitElement))
+          var descriptor = ConnectorRevitUtils.ObjectDescriptor(revitElement);
+          // get the report object
+          // for hosted elements, they may have already been converted and added to the converter report
+          bool alreadyConverted = converter.Report.GetReportObject(revitElement.UniqueId, out int index);
+          var reportObj = alreadyConverted ?
+            converter.Report.ReportObjects[index] :
+            new ApplicationObject(revitElement.UniqueId, descriptor) { applicationId = revitElement.UniqueId };
+          if (alreadyConverted)
           {
-            state.Errors.Add(new Exception($"Skipping not supported type: {revitElement.GetType()}, name {revitElement.Name}"));
+            progress.Report.Log(reportObj);
             continue;
           }
-
-          var conversionResult = converter.ConvertToSpeckle(revitElement);
-
-          conversionProgressDict["Conversion"]++;
-          UpdateProgress(conversionProgressDict, state.Progress);
-
-          placeholders.Add(new ApplicationObject(revitElement.UniqueId, revitElement.GetType().ToString()) { applicationId = revitElement.UniqueId });
-
-          convertedCount++;
-
-          //hosted elements will be returned as `null` by the ConvertToSpeckle method 
-          //since they are handled when converting their parents
-          if (conversionResult != null)
+          try
           {
-            var category = $"@{revitElement.Category.Name}";
-            if (commitObject[category] == null)
-              commitObject[category] = new List<Base>();
-
-            ((List<Base>)commitObject[category]).Add(conversionResult);
+            if (revitElement == null)
+              continue;
+
+            if (!converter.CanConvertToSpeckle(revitElement))
+            {
+              reportObj.Update(status: ApplicationObject.State.Skipped, logItem: $"Sending this object type is not supported in Revit");
+              progress.Report.Log(reportObj);
+              continue;
+            }
+
+            if (progress.CancellationTokenSource.Token.IsCancellationRequested)
+              return true;
+
+            converter.Report.Log(reportObj); // Log object so converter can access
+
+            var conversionResult = converter.ConvertToSpeckle(revitElement);
+
+            conversionProgressDict["Conversion"]++;
+            progress.Update(conversionProgressDict);
+
+            var s = new CancellationTokenSource();
+            DispatcherTimer.RunOnce(() => s.Cancel(), TimeSpan.FromMilliseconds(1));
+            Dispatcher.UIThread.MainLoop(s.Token);
+
+            convertedCount++;
+
+            if (conversionResult == null)
+            {
+              reportObj.Update(status: ApplicationObject.State.Failed, logItem: $"Conversion returned null");
+              progress.Report.Log(reportObj);
+              continue;
+            }
+
+            // here we are checking to see if we're receiving an object that has a host
+            // but the host doesn't know that it is a host
+            if (conversionResult["speckleHost"] is Base host && host["category"] is string catName)
+            {
+              commitObject[$"@{catName}"] ??= new List<Base>();
+              if (commitObject[$"@{catName}"] is List<Base> objs)
+              {
+                var hostIndex = objs.FindIndex(obj => obj.applicationId == host.applicationId);
+                // if the "host" is present, then it has already been converted and we need to 
+                // attach the current, dependent, elements as a hosted element
+                if (hostIndex != -1)
+                {
+                  objs[hostIndex]["elements"] ??= new List<Base>();
+                  ((List<Base>)objs[hostIndex]["elements"]).Add(conversionResult);
+                }
+                // if host is not present, then it hasn't been converted yet
+                // create a placeholder that will be overridden later, but that will contain the hosted element
+                else
+                {
+                  var newBase = new Base() { applicationId = host.applicationId };
+                  newBase["elements"] = new List<Base>() { conversionResult };
+                  objs.Add(newBase);
+                }
+
+                // remove the speckleHost element that we added
+                conversionResult["speckleHost"] = null;
+
+                reportObj.Update(status: ApplicationObject.State.Created, logItem: $"Attached as hosted element to {host.applicationId}");
+              }
+            }
+            //is an element type, nest it under Types instead
+            else if (typeof(ElementType).IsAssignableFrom(revitElement.GetType()))
+            {
+              var category = $"@{revitElement.Category.Name}";
+
+              if (commitObject["Types"] == null)
+                commitObject["Types"] = new Base();
+
+              if ((commitObject["Types"] as Base)[category] == null)
+                (commitObject["Types"] as Base)[category] = new List<Base>();
+
+              ((List<Base>)((commitObject["Types"] as Base)[category])).Add(conversionResult);
+            }
+            else
+            {
+              var category = conversionResult.GetType().Name == "Network" ?
+                "@Networks" :
+                $"@{revitElement.Category.Name}";
+
+              commitObject[category] ??= new List<Base>();
+
+              if (commitObject[category] is List<Base> objs)
+              {
+                var hostIndex = objs.FindIndex(obj => obj.applicationId == conversionResult.applicationId);
+              
+                // here we are checking to see if we're converting a host that doesn't know it is a host
+                // and if dependent elements of that host have already been converted
+                if (hostIndex != -1 && objs[hostIndex]["elements"] is List<Base> elements)
+                {
+                  objs.RemoveAt(hostIndex);
+                  if (conversionResult["elements"] is List<Base> els)
+                    els.AddRange(elements);
+                  else
+                    conversionResult["elements"] = elements;
+                }
+                objs.Add(conversionResult);
+              }
+            }
+
+            reportObj.Update(status: ApplicationObject.State.Created, logItem: $"Sent as {ConnectorRevitUtils.SimplifySpeckleType(conversionResult.speckle_type)}");
           }
+          catch (Exception e)
+          {
+            reportObj.Update(status: ApplicationObject.State.Failed, logItem: $"{e.Message}");
+          }
+          progress.Report.Log(reportObj);
         }
-        catch (Exception e)
-        {
-          state.Errors.Add(e);
-        }
-      }
+        return false;
+      });
 
-      if (converter.Report.ConversionErrorsCount != 0)
-      {
-        // TODO: Get rid of the custom Error class. It's not needed.
-        ConversionErrors.AddRange(converter.Report.ConversionErrors);
-        state.Errors.AddRange(converter.Report.ConversionErrors);
-      }
+      if (cancelSend)
+        return null;
+
+      progress.Report.Merge(converter.Report);
 
       if (convertedCount == 0)
       {
-        Globals.Notify("Zero objects converted successfully. Send stopped.");
-        return state;
+        progress.Report.LogOperationError(new Exception("Zero objects converted successfully. Send stopped."));
+        return null;
       }
 
-      Execute.PostToUIThread(() => state.Progress.Maximum = (int)commitObject.GetTotalChildrenCount());
-
-      if (state.CancellationTokenSource.Token.IsCancellationRequested)
-        return state;
+      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
+        return null;
 
       var transports = new List<ITransport>() { new ServerTransport(client.Account, streamId) };
 
       var objectId = await Operations.Send(
         @object: commitObject,
-        cancellationToken: state.CancellationTokenSource.Token,
+        cancellationToken: progress.CancellationTokenSource.Token,
         transports: transports,
-        onProgressAction: dict => UpdateProgress(dict, state.Progress),
+        onProgressAction: dict => progress.Update(dict),
         onErrorAction: (s, e) =>
         {
-          OperationErrors.Add(e); // TODO!
-          state.Errors.Add(e);
-          state.CancellationTokenSource.Cancel();
+          progress.Report.LogOperationError(e);
+          progress.CancellationTokenSource.Cancel();
         },
         disposeTransports: true
         );
 
-      if (OperationErrors.Count != 0)
-      {
-        Globals.Notify("Failed to send.");
-        state.Errors.AddRange(OperationErrors);
-        return state;
-      }
+      if (progress.Report.OperationErrorsCount != 0)
+        return null;
 
-      if (state.CancellationTokenSource.Token.IsCancellationRequested)
+      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
         return null;
 
       var actualCommit = new CommitCreateInput()
       {
         streamId = streamId,
         objectId = objectId,
-        branchName = state.Branch.name,
+        branchName = state.BranchName,
         message = state.CommitMessage != null ? state.CommitMessage : $"Sent {convertedCount} objects from {ConnectorRevitUtils.RevitAppName}.",
         sourceApplication = ConnectorRevitUtils.RevitAppName,
       };
 
       if (state.PreviousCommitId != null) { actualCommit.parents = new List<string>() { state.PreviousCommitId }; }
-
+      string commitId = null;
       try
       {
-        var commitId = await client.CommitCreate(actualCommit);
+        commitId = await client.CommitCreate(actualCommit);
 
-        await state.RefreshStream();
+        //await state.RefreshStream();
         state.PreviousCommitId = commitId;
-
-        WriteStateToFile();
-        RaiseNotification($"{convertedCount} objects sent to Speckle 🚀");
       }
       catch (Exception e)
       {
-        state.Errors.Add(e);
-        Globals.Notify($"Failed to create commit.\n{e.Message}");
+        progress.Report.LogOperationError(e);
       }
 
-      return state;
+      return commitId;
     }
 
   }
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.cs
index 8b7d9cc0b7..7555dd4207 100644
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.cs
+++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.cs
@@ -1,13 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Timers;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
-using Speckle.ConnectorRevit.Entry;
+using DesktopUI2;
+using DesktopUI2.Models;
 using Speckle.ConnectorRevit.Storage;
+using Speckle.Core.Kits;
 using Speckle.Core.Models;
-using Speckle.DesktopUI;
-using Speckle.DesktopUI.Utils;
+using Timer = System.Timers.Timer;
 
 namespace Speckle.ConnectorRevit.UI
 {
@@ -17,57 +19,38 @@ public partial class ConnectorBindingsRevit : ConnectorBindings
 
     public static UIDocument CurrentDoc => RevitApp.ActiveUIDocument;
 
-    /// <summary>
-    /// Stores the actions for the ExternalEvent handler
-    /// </summary>
-    public List<Action> Queue;
-
-    public ExternalEvent Executor;
-
     public Timer SelectionTimer;
 
-    public ConnectorBindingsRevit(UIApplication revitApp) : base()
-    {
-      RevitApp = revitApp;
-      Queue = new List<Action>();
-    }
+    //Only use an instance of the converter as a local variable to avoid conflicts if multiple sending/receiving
+    //operations are happening at the same time
+    public ISpeckleConverter Converter { get; set; } = KitManager.GetDefaultKit().LoadConverter(ConnectorRevitUtils.RevitAppName);
+
+    public List<Exception> ConversionErrors { get; set; } = new List<Exception>();
 
     /// <summary>
-    /// Sets the revit external event handler and initialises the rocket engines.
+    /// Keeps track of errors in the operations of send/receive.
     /// </summary>
-    /// <param name="eventHandler"></param>
-    public void SetExecutorAndInit(ExternalEvent eventHandler)
-    {
-      Executor = eventHandler;
-
-      // LOCAL STATE
-      // GetStreamsInFile();
+    public List<Exception> OperationErrors { get; set; } = new List<Exception>();
 
-      //// GLOBAL EVENT HANDLERS
-      RevitApp.ViewActivated += RevitApp_ViewActivated;
-      RevitApp.Application.DocumentChanged += Application_DocumentChanged;
-      RevitApp.Application.DocumentOpened += Application_DocumentOpened;
-      RevitApp.Application.DocumentClosed += Application_DocumentClosed;
-
-      SelectionTimer = new Timer(1400) { AutoReset = true, Enabled = true };
-      SelectionTimer.Elapsed += SelectionTimer_Elapsed;
-      // TODO: Find a way to handle when document is closed via middle mouse click
-      // thus triggering the focus on a new project
+    public ConnectorBindingsRevit(UIApplication revitApp) : base()
+    {
+      RevitApp = revitApp;
     }
 
     private void SelectionTimer_Elapsed(object sender, ElapsedEventArgs e)
     {
       var selectedObjects = GetSelectedObjects();
 
-      NotifyUi(new UpdateSelectionCountEvent() { SelectionCount = selectedObjects.Count });
-      NotifyUi(new UpdateSelectionEvent() { ObjectIds = selectedObjects });
-    }
+      //TODO
 
-    public override string GetHostAppName() => ConnectorRevitUtils.RevitAppName.Replace("Revit", "Revit "); //hack for ADSK store
+      //NotifyUi(new UpdateSelectionCountEvent() { SelectionCount = selectedObjects.Count });
+      //NotifyUi(new UpdateSelectionEvent() { ObjectIds = selectedObjects });
+    }
 
-    public override string GetDocumentId() => GetDocHash(CurrentDoc?.Document);
+    public override string GetHostAppNameVersion() => ConnectorRevitUtils.RevitAppName.Replace("Revit", "Revit "); //hack for ADSK store
+    public override string GetHostAppName() => HostApplications.Revit.Slug;
 
-    private string GetDocHash(Document doc) => Utilities.hashString(doc.PathName + doc.Title, Utilities.HashingFuctions.MD5);
+    public override string GetDocumentId() => CurrentDoc?.Document?.GetHashCode().ToString();
 
     public override string GetDocumentLocation() => CurrentDoc.Document.PathName;
 
@@ -75,65 +58,62 @@ private void SelectionTimer_Elapsed(object sender, ElapsedEventArgs e)
 
     public override string GetFileName() => CurrentDoc.Document.Title;
 
-    public override void SelectClientObjects(string args)
+    public override List<StreamState> GetStreamsInFile()
     {
-      // TODO!
-    }
+      var streams = new List<StreamState>();
+      if (CurrentDoc != null)
+        streams = StreamStateManager.ReadState(CurrentDoc.Document);
 
-    #region app events
+      return streams;
+    }
 
-    //checks whether to refresh the stream list in case the user changes active view and selects a different document
-    private void RevitApp_ViewActivated(object sender, Autodesk.Revit.UI.Events.ViewActivatedEventArgs e)
+    public override List<ReceiveMode> GetReceiveModes()
     {
-
-      if (e.Document == null || e.Document.IsFamilyDocument || e.PreviousActiveView == null || GetDocHash(e.Document) == GetDocHash(e.PreviousActiveView.Document))
-        return;
-
-      var appEvent = new ApplicationEvent()
-      {
-        Type = ApplicationEvent.EventType.ViewActivated,
-        DynamicInfo = GetStreamsInFile()
-      };
-      NotifyUi(appEvent);
+      return new List<ReceiveMode> { ReceiveMode.Update, ReceiveMode.Create, ReceiveMode.Ignore };
     }
 
-    private void Application_DocumentClosed(object sender, Autodesk.Revit.DB.Events.DocumentClosedEventArgs e)
+    //TODO
+    public override List<MenuItem> GetCustomStreamMenuItems()
     {
-      // the DocumentClosed event is triggered AFTER ViewActivated
-      // is both doc A and B are open and B is closed, this would result in wiping the list of streams retrieved for A
-      // only proceed if it's the last document open (the current is null)
-      if (CurrentDoc != null)
-        return;
-
-      if (SpeckleRevitCommand.Bootstrapper != null && SpeckleRevitCommand.Bootstrapper.Application != null)
-        SpeckleRevitCommand.Bootstrapper.Application.MainWindow.Hide();
-
-      var appEvent = new ApplicationEvent() { Type = ApplicationEvent.EventType.DocumentClosed };
-      NotifyUi(appEvent);
+      return new List<MenuItem>();
     }
 
-    // this method is triggered when there are changes in the active document
-    private void Application_DocumentChanged(object sender, Autodesk.Revit.DB.Events.DocumentChangedEventArgs e)
-    { }
+    // WARNING: Everything in the 'interop' section must match a corrosponding element in the converter
+    // which can be found in the namespace commented above the element
+    #region interop
 
-    private void Application_DocumentOpened(object sender, Autodesk.Revit.DB.Events.DocumentOpenedEventArgs e)
+    // Objects.Structural.Geometry
+    public enum ElementType1D
     {
-      var streams = GetStreamsInFile();
-      if (streams != null && streams.Count != 0)
-      {
-        SpeckleRevitCommand.OpenOrFocusSpeckle(RevitApp);
-      }
-
-      var appEvent = new ApplicationEvent()
-      {
-        Type = ApplicationEvent.EventType.DocumentOpened,
-        DynamicInfo = streams
-      };
-
-      NotifyUi(appEvent);
+      Beam,
+      Brace,
+      Bar,
+      Column,
+      Rod,
+      Spring,
+      Tie,
+      Strut,
+      Link,
+      Damper,
+      Cable,
+      Spacer,
+      Other,
+      Null
     }
 
+    // Objects.Structural
+    public enum PropertyType2D
+    {
+      Stress,
+      Fabric,
+      Plate,
+      Shell,
+      Curved,
+      Wall,
+      Strain,
+      Axi,
+      Load
+    }
     #endregion
-
   }
 }
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Receive.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Receive.cs
deleted file mode 100644
index 5948b681e2..0000000000
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Receive.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Autodesk.Revit.DB;
-using Avalonia.Threading;
-using ConnectorRevit.Revit;
-using DesktopUI2.Models;
-using DesktopUI2.Models.Settings;
-using DesktopUI2.ViewModels;
-using Revit.Async;
-using Speckle.Core.Api;
-using Speckle.Core.Kits;
-using Speckle.Core.Models;
-using Speckle.Core.Transports;
-
-namespace Speckle.ConnectorRevit.UI
-{
-  
-  public partial class ConnectorBindingsRevit2
-  {
-    public List<ApplicationObject> Preview { get; set; } = new List<ApplicationObject>();
-    public Dictionary<string, Base> StoredObjects = new Dictionary<string, Base>();
-
-    public override bool CanPreviewReceive => false;
-
-    public override Task<StreamState> PreviewReceive(StreamState state, ProgressViewModel progress)
-    {
-      return null;
-      // TODO!
-    }
-
-    /// <summary>
-    /// Receives a stream and bakes into the existing revit file.
-    /// </summary>
-    /// <param name="state"></param>
-    /// <returns></returns>
-    /// 
-    public override async Task<StreamState> ReceiveStream(StreamState state, ProgressViewModel progress)
-    {
-      //make sure to instance a new copy so all values are reset correctly
-      var converter = (ISpeckleConverter)Activator.CreateInstance(Converter.GetType());
-      converter.SetContextDocument(CurrentDoc.Document);
-      var previouslyReceiveObjects = state.ReceivedObjects;
-
-      // set converter settings as tuples (setting slug, setting selection)
-      var settings = new Dictionary<string, string>();
-      CurrentSettings = state.Settings;
-      foreach (var setting in state.Settings)
-        settings.Add(setting.Slug, setting.Selection);
-      converter.SetConverterSettings(settings);
-
-      var transport = new ServerTransport(state.Client.Account, state.StreamId);
-
-      var stream = await state.Client.StreamGet(state.StreamId);
-
-      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
-        return null;
-
-      Commit myCommit = null;
-      //if "latest", always make sure we get the latest commit when the user clicks "receive"
-      if (state.CommitId == "latest")
-      {
-        var res = await state.Client.BranchGet(progress.CancellationTokenSource.Token, state.StreamId, state.BranchName, 1);
-        myCommit = res.commits.items.FirstOrDefault();
-      }
-      else
-      {
-        myCommit = await state.Client.CommitGet(progress.CancellationTokenSource.Token, state.StreamId, state.CommitId);
-      }
-
-      state.LastSourceApp = myCommit.sourceApplication;
-
-      string referencedObject = myCommit.referencedObject;
-
-      var commitObject = await Operations.Receive(
-          referencedObject,
-          progress.CancellationTokenSource.Token,
-          transport,
-          onProgressAction: dict => progress.Update(dict),
-          onErrorAction: (s, e) =>
-          {
-            progress.Report.LogOperationError(e);
-            progress.CancellationTokenSource.Cancel();
-          },
-          onTotalChildrenCountKnown: count => { progress.Max = count; },
-          disposeTransports: true
-          );
-
-      try
-      {
-        await state.Client.CommitReceived(new CommitReceivedInput
-        {
-          streamId = stream?.id,
-          commitId = myCommit?.id,
-          message = myCommit?.message,
-          sourceApplication = ConnectorRevitUtils.RevitAppName
-        });
-      }
-      catch
-      {
-        // Do nothing!
-      }
-
-      if (progress.Report.OperationErrorsCount != 0)
-        return state;
-
-      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
-        return null;
-
-      Preview.Clear();
-      StoredObjects.Clear();
-
-
-      Preview = FlattenCommitObject(commitObject, converter);
-      foreach (var previewObj in Preview)
-        progress.Report.Log(previewObj);
-
-      converter.ReceiveMode = state.ReceiveMode;
-      // needs to be set for editing to work 
-      converter.SetPreviousContextObjects(previouslyReceiveObjects);
-      // needs to be set for openings in floors and roofs to work
-      converter.SetContextObjects(Preview);
-
-      try
-      {
-        await RevitTask.RunAsync(() => UpdateForCustomMapping(state, progress, myCommit.sourceApplication));
-      }
-      catch (Exception ex)
-      {
-        progress.Report.LogOperationError(new Exception("Could not update receive object with user types. Using default mapping."));
-      }
-
-      await RevitTask.RunAsync(app =>
-      {
-        using (var t = new Transaction(CurrentDoc.Document, $"Baking stream {state.StreamId}"))
-        {
-          var failOpts = t.GetFailureHandlingOptions();
-          failOpts.SetFailuresPreprocessor(new ErrorEater(converter));
-          failOpts.SetClearAfterRollback(true);
-          t.SetFailureHandlingOptions(failOpts);
-          t.Start();
-          
-          var newPlaceholderObjects = ConvertReceivedObjects(converter, progress);
-          // receive was cancelled by user
-          if (newPlaceholderObjects == null)
-          {
-            progress.Report.LogOperationError(new Exception("fatal error: receive cancelled by user"));
-            t.RollBack();
-            return;
-          }
-
-          if (state.ReceiveMode == ReceiveMode.Update)
-            DeleteObjects(previouslyReceiveObjects, newPlaceholderObjects);
-
-          state.ReceivedObjects = newPlaceholderObjects;
-
-          t.Commit();
-        }
-
-      });
-
-      if (converter.Report.OperationErrors.Any(x => x.Message.Contains("fatal error")))
-        return null; // the commit is being rolled back
-
-      return state;
-    }
-
-    //delete previously sent object that are no more in this stream
-    private void DeleteObjects(List<ApplicationObject> previouslyReceiveObjects, List<ApplicationObject> newPlaceholderObjects)
-    {
-      foreach (var obj in previouslyReceiveObjects)
-      {
-        if (obj.CreatedIds.Count == 0 || newPlaceholderObjects.Any(x => x.applicationId == obj.applicationId))
-          continue;
-
-        var element = CurrentDoc.Document.GetElement(obj.CreatedIds.FirstOrDefault());
-        if (element != null)
-          CurrentDoc.Document.Delete(element.Id);
-      }
-    }
-
-    private List<ApplicationObject> ConvertReceivedObjects(ISpeckleConverter converter, ProgressViewModel progress)
-    {
-      var placeholders = new List<ApplicationObject>();
-      var conversionProgressDict = new ConcurrentDictionary<string, int>();
-      conversionProgressDict["Conversion"] = 1;
-
-      // Get setting to skip linked model elements if necessary
-      var receiveLinkedModelsSetting = CurrentSettings.FirstOrDefault(x => x.Slug == "linkedmodels-receive") as CheckBoxSetting;
-      var receiveLinkedModels = receiveLinkedModelsSetting != null ? receiveLinkedModelsSetting.IsChecked : false;
-
-      foreach (var obj in Preview)
-      {
-        var @base = StoredObjects[obj.OriginalId];
-        if (progress.CancellationTokenSource.Token.IsCancellationRequested)
-        {
-          placeholders = null;
-          break;
-        }
-
-        try
-        {
-          conversionProgressDict["Conversion"]++;
-          progress.Update(conversionProgressDict);
-
-          var s = new CancellationTokenSource();
-          DispatcherTimer.RunOnce(() => s.Cancel(), TimeSpan.FromMilliseconds(10));
-          Dispatcher.UIThread.MainLoop(s.Token);
-
-          //skip element if is from a linked file and setting is off
-          if (!receiveLinkedModels && @base["isRevitLinkedModel"] != null && bool.Parse(@base["isRevitLinkedModel"].ToString()))
-            continue;
-
-          var convRes = converter.ConvertToNative(@base);
-
-          //regenerate the document and then implement a hack to "refresh" the view
-          CurrentDoc.Document.Regenerate();
-
-          // get the active ui view
-          var view = CurrentDoc.ActiveGraphicalView ?? CurrentDoc.Document.ActiveView;
-          var uiView = CurrentDoc.GetOpenUIViews().FirstOrDefault(uv => uv.ViewId.Equals(view.Id));
-
-          // "refresh" the active view
-          uiView.Zoom(1);
-
-          switch (convRes)
-          {
-            case ApplicationObject o:
-              placeholders.Add(o);
-              obj.Update(status: o.Status, createdIds: o.CreatedIds, converted: o.Converted, log: o.Log);
-              progress.Report.UpdateReportObject(obj);
-              break;
-            default:
-              break;
-          }
-        }
-        catch (Exception e)
-        {
-          obj.Update(status: ApplicationObject.State.Failed, logItem: e.Message);
-          progress.Report.UpdateReportObject(obj);
-        }
-      }
-
-      return placeholders;
-    }
-
-    /// <summary>
-    /// Recurses through the commit object and flattens it. 
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <param name="converter"></param>
-    /// <returns></returns>
-    private List<ApplicationObject> FlattenCommitObject(object obj, ISpeckleConverter converter)
-    {
-      var objects = new List<ApplicationObject>();
-
-      if (obj is Base @base)
-      {
-        var appObj = new ApplicationObject(@base.id, ConnectorRevitUtils.SimplifySpeckleType(@base.speckle_type)) { applicationId = @base.applicationId, Status = ApplicationObject.State.Unknown };
-
-        if (converter.CanConvertToNative(@base))
-        {
-          appObj.Convertible = true;
-          objects.Add(appObj);
-          StoredObjects.Add(@base.id, @base);
-          return objects;
-        }
-        else
-        {
-          foreach (var prop in @base.GetDynamicMembers())
-            objects.AddRange(FlattenCommitObject(@base[prop], converter));
-          return objects;
-        }
-      }
-
-      if (obj is List<object> list)
-      {
-        foreach (var listObj in list)
-          objects.AddRange(FlattenCommitObject(listObj, converter));
-        return objects;
-      }
-
-      if (obj is IDictionary dict)
-      {
-        foreach (DictionaryEntry kvp in dict)
-          objects.AddRange(FlattenCommitObject(kvp.Value, converter));
-        return objects;
-      }
-
-      else
-      {
-        if (obj != null && !obj.GetType().IsPrimitive && !(obj is string))
-        {
-          var appObj = new ApplicationObject(obj.GetHashCode().ToString(), obj.GetType().ToString());
-          appObj.Update(status: ApplicationObject.State.Skipped, logItem: $"Receiving this object type is not supported in Revit");
-          objects.Add(appObj);
-        }
-      }
-
-      return objects;
-    }
-  }
-}
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Selection.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Selection.cs
deleted file mode 100644
index bdecf0d020..0000000000
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Selection.cs
+++ /dev/null
@@ -1,340 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Autodesk.Revit.DB;
-using ConnectorRevit;
-using DesktopUI2.Models.Filters;
-using DesktopUI2.Models.Settings;
-using Speckle.Core.Logging;
-
-namespace Speckle.ConnectorRevit.UI
-{
-  public partial class ConnectorBindingsRevit2
-  {
-    public override List<ISelectionFilter> GetSelectionFilters()
-    {
-      var categories = new List<string>();
-      var parameters = new List<string>();
-      var views = new List<string>();
-      var worksets = new List<string>();
-      var projectInfo = new List<string> { "Project Info", "Levels", "Views 2D", "Views 3D", "Families & Types" };
-
-      if (CurrentDoc != null)
-      {
-        //selectionCount = CurrentDoc.Selection.GetElementIds().Count();
-        categories = ConnectorRevitUtils.GetCategoryNames(CurrentDoc.Document);
-        parameters = ConnectorRevitUtils.GetParameterNames(CurrentDoc.Document);
-        views = ConnectorRevitUtils.GetViewNames(CurrentDoc.Document);
-        worksets = ConnectorRevitUtils.GetWorksets(CurrentDoc.Document);
-      }
-
-      var filters = new List<ISelectionFilter>
-      {
-         new AllSelectionFilter {Slug="all",  Name = "Everything", Icon = "CubeScan", Description = "Sends all supported elements and project information." },
-        new ManualSelectionFilter(),
-        new ListSelectionFilter {Slug="category", Name = "Category", Icon = "Category", Values = categories, Description="Adds all elements belonging to the selected categories"},
-        new ListSelectionFilter {Slug="view", Name = "View", Icon = "RemoveRedEye", Values = views, Description="Adds all objects visible in the selected views" },
-        new ListSelectionFilter {Slug="project-info", Name = "Project Information", Icon = "Information", Values = projectInfo, Description="Adds the selected project information such as levels, views and family names to the stream"},
-          new PropertySelectionFilter
-        {
-          Slug="param",
-          Name = "Parameter",
-          Description="Adds all objects satisfying the selected parameter",
-          Icon = "FilterList",
-          Values = parameters,
-          Operators = new List<string> {"equals", "contains", "is greater than", "is less than"}
-        }
-
-      };
-      if (worksets.Any())
-        filters.Insert(4, new ListSelectionFilter { Slug = "workset", Name = "Workset", Icon = "Group", Values = worksets, Description = "Adds all elements belonging to the selected workset" });
-
-
-      return filters;
-    }
-
-    public override List<string> GetSelectedObjects()
-    {
-      if (CurrentDoc == null)
-      {
-        return new List<string>();
-      }
-
-      var selectedObjects = CurrentDoc.Selection.GetElementIds().Select(id => CurrentDoc.Document.GetElement(id).UniqueId).ToList();
-      return selectedObjects;
-    }
-
-    public override List<string> GetObjectsInView()
-    {
-      if (CurrentDoc == null)
-      {
-        return new List<string>();
-      }
-
-      var collector = new FilteredElementCollector(CurrentDoc.Document, CurrentDoc.Document.ActiveView.Id).WhereElementIsNotElementType();
-      var elementIds = collector.ToElements().Select(el => el.UniqueId).ToList(); ;
-
-      return elementIds;
-    }
-
-    public override void SelectClientObjects(List<string> args, bool deselect = false)
-    {
-      var selection = args.Select(x => CurrentDoc.Document.GetElement(x))?.Where(x => x != null)?.Select(x => x.Id)?.ToList();
-      if (selection != null)
-      {
-        if (!deselect)
-        {
-          var currentSelection = CurrentDoc.Selection.GetElementIds().ToList();
-          if (currentSelection != null) currentSelection.AddRange(selection);
-          else currentSelection = selection;
-          try
-          {
-            CurrentDoc.Selection.SetElementIds(currentSelection);
-            CurrentDoc.ShowElements(currentSelection);
-          }
-          catch (Exception e) { }
-        }
-        else
-        {
-          var updatedSelection = CurrentDoc.Selection.GetElementIds().Where(x => !selection.Contains(x)).ToList();
-          CurrentDoc.Selection.SetElementIds(updatedSelection);
-          if (updatedSelection.Any()) CurrentDoc.ShowElements(updatedSelection);
-        }
-      }
-    }
-
-    private List<Document> GetLinkedDocuments()
-    {
-      var docs = new List<Document>();
-
-      // Get settings and return empty list if we should not send linked models
-      var sendLinkedModels = CurrentSettings?.FirstOrDefault(x => x.Slug == "linkedmodels-send") as CheckBoxSetting;
-      if (sendLinkedModels == null || !sendLinkedModels.IsChecked)
-        return docs;
-
-
-      //TODO: is the name the most safe way to look for it?
-      var linkedRVTs = new FilteredElementCollector(CurrentDoc.Document).OfCategory(BuiltInCategory.OST_RvtLinks).OfClass(typeof(RevitLinkType)).ToElements().Cast<RevitLinkType>().Select(x => x.Name.Replace(".rvt", ""));
-      foreach (Document revitDoc in RevitApp.Application.Documents)
-      {
-        if (revitDoc.IsLinked && linkedRVTs.Contains(revitDoc.Title))
-        {
-          docs.Add(revitDoc);
-        }
-      }
-
-      return docs;
-    }
-
-    /// <summary>
-    /// Given the filter in use by a stream returns the document elements that match it.
-    /// </summary>
-    /// <param name="filter"></param>
-    /// <returns></returns>
-    private List<Element> GetSelectionFilterObjects(ISelectionFilter filter)
-    {
-      var currentDoc = CurrentDoc.Document;
-      var allDocs = GetLinkedDocuments();
-      allDocs.Add(currentDoc);
-
-      var selection = new List<Element>();
-      try
-      {
-
-        switch (filter.Slug)
-        {
-
-          case "manual":
-            selection = filter.Selection.Select(x => CurrentDoc.Document.GetElement(x)).Where(x => x != null).ToList();
-            var linkedFiles = selection.Where(x => x is RevitLinkInstance).Cast<RevitLinkInstance>().ToList();
-
-            foreach (var linkedFile in linkedFiles)
-            {
-              var match = allDocs.FirstOrDefault(x => x.Title == linkedFile.Name.Split(new string[] { ".rvt" }, StringSplitOptions.None)[0]);
-              if (match != null)
-                selection.AddRange(match.SupportedElements());
-            }
-
-            return selection;
-
-          case "all":
-            //add these only for the current doc
-            selection.Add(currentDoc.ProjectInformation);
-            selection.AddRange(currentDoc.Views2D());
-            selection.AddRange(currentDoc.Views3D());
-
-            //and these for every linked doc
-            foreach (var doc in allDocs)
-            {
-              selection.AddRange(doc.SupportedElements()); // includes levels
-              selection.AddRange(doc.SupportedTypes());
-            }
-
-            return selection;
-
-          case "category":
-            var catFilter = filter as ListSelectionFilter;
-            var bics = new List<BuiltInCategory>();
-            var categories = ConnectorRevitUtils.GetCategories(currentDoc);
-            IList<ElementFilter> elementFilters = new List<ElementFilter>();
-
-            foreach (var cat in catFilter.Selection)
-            {
-              elementFilters.Add(new ElementCategoryFilter(categories[cat].Id));
-            }
-
-            var categoryFilter = new LogicalOrFilter(elementFilters);
-            foreach (var doc in allDocs)
-            {
-              selection.AddRange(new FilteredElementCollector(doc)
-             .WhereElementIsNotElementType()
-             .WhereElementIsViewIndependent()
-             .WherePasses(categoryFilter).ToList());
-            }
-
-            return selection;
-
-          case "view":
-            var viewFilter = filter as ListSelectionFilter;
-
-            var views = new FilteredElementCollector(currentDoc)
-              .WhereElementIsNotElementType()
-              .OfClass(typeof(View))
-              .Where(x => viewFilter.Selection.Contains(x.Name));
-
-            foreach (var view in views)
-            {
-              var ids = selection.Select(x => x.UniqueId);
-
-              foreach (var doc in allDocs)
-              {
-                selection.AddRange(new FilteredElementCollector(doc, view.Id)
-                .WhereElementIsNotElementType()
-                .WhereElementIsViewIndependent()
-                //.Where(x => x.IsPhysicalElement())
-                .Where(x => !ids.Contains(x.UniqueId)) //exclude elements already added from other views
-                .ToList());
-              }
-            }
-            return selection;
-
-          case "project-info":
-            var projectInfoFilter = filter as ListSelectionFilter;
-
-            if (projectInfoFilter.Selection.Contains("Project Info"))
-              selection.Add(currentDoc.ProjectInformation);
-
-            if (projectInfoFilter.Selection.Contains("Views 2D"))
-              selection.AddRange(currentDoc.Views2D());
-
-            if (projectInfoFilter.Selection.Contains("Views 3D"))
-              selection.AddRange(currentDoc.Views3D());
-
-            if (projectInfoFilter.Selection.Contains("Levels"))
-              selection.AddRange(currentDoc.Levels());
-
-            if (projectInfoFilter.Selection.Contains("Families & Types"))
-              selection.AddRange(currentDoc.SupportedTypes());
-
-            return selection;
-
-          case "workset":
-            var worksetFilter = filter as ListSelectionFilter;
-            var worksets = new FilteredWorksetCollector(currentDoc).Where(x => worksetFilter.Selection.Contains(x.Name)).Select(x => x.Id).ToList();
-            foreach (var doc in allDocs)
-            {
-              var collector = new FilteredElementCollector(doc);
-              var elementWorksetFilters = new List<ElementFilter>();
-
-              foreach (var w in worksets)
-              {
-                elementWorksetFilters.Add(new ElementWorksetFilter(w));
-              }
-
-              var worksetLogicalFilter = new LogicalOrFilter(elementWorksetFilters);
-              selection.AddRange(collector.WherePasses(worksetLogicalFilter).ToElements().ToList());
-            }
-            return selection;
-
-          case "param":
-            try
-            {
-              foreach (var doc in allDocs)
-              {
-                var propFilter = filter as PropertySelectionFilter;
-                var query = new FilteredElementCollector(doc)
-                  .WhereElementIsNotElementType()
-                  .WhereElementIsNotElementType()
-                  .WhereElementIsViewIndependent()
-                  .Where(x => x.IsPhysicalElement())
-                  .Where(fi => fi.LookupParameter(propFilter.PropertyName) != null);
-
-                propFilter.PropertyValue = propFilter.PropertyValue.ToLowerInvariant();
-
-                switch (propFilter.PropertyOperator)
-                {
-                  case "equals":
-                    query = query.Where(fi =>
-                      GetStringValue(fi.LookupParameter(propFilter.PropertyName)) == propFilter.PropertyValue);
-                    break;
-                  case "contains":
-                    query = query.Where(fi =>
-                      GetStringValue(fi.LookupParameter(propFilter.PropertyName)).Contains(propFilter.PropertyValue));
-                    break;
-                  case "is greater than":
-                    query = query.Where(fi => RevitVersionHelper.ConvertFromInternalUnits(
-                                                fi.LookupParameter(propFilter.PropertyName).AsDouble(),
-                                                fi.LookupParameter(propFilter.PropertyName)) >
-                                              double.Parse(propFilter.PropertyValue));
-                    break;
-                  case "is less than":
-                    query = query.Where(fi => RevitVersionHelper.ConvertFromInternalUnits(
-                                                fi.LookupParameter(propFilter.PropertyName).AsDouble(),
-                                                fi.LookupParameter(propFilter.PropertyName)) <
-                                              double.Parse(propFilter.PropertyValue));
-                    break;
-                }
-
-                selection.AddRange(query.ToList());
-              }
-            }
-            catch (Exception e)
-            {
-              Log.CaptureException(e);
-            }
-            return selection;
-        }
-      }
-      catch (Exception e)
-      {
-
-      }
-
-      return selection;
-
-    }
-
-    private string GetStringValue(Parameter p)
-    {
-      string value = "";
-      if (!p.HasValue)
-      {
-        return value;
-      }
-
-      if (string.IsNullOrEmpty(p.AsValueString()) && string.IsNullOrEmpty(p.AsString()))
-      {
-        return value;
-      }
-
-      if (!string.IsNullOrEmpty(p.AsValueString()))
-      {
-        return p.AsValueString().ToLowerInvariant();
-      }
-      else
-      {
-        return p.AsString().ToLowerInvariant();
-      }
-    }
-  }
-}
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Send.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Send.cs
deleted file mode 100644
index ad65bb1fbd..0000000000
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.Send.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Autodesk.Revit.DB;
-using DesktopUI2.Models;
-using DesktopUI2.Models.Settings;
-using DesktopUI2.ViewModels;
-using Speckle.Core.Api;
-using Speckle.Core.Kits;
-using Speckle.Core.Models;
-using Speckle.Core.Transports;
-
-namespace Speckle.ConnectorRevit.UI
-{
-  public partial class ConnectorBindingsRevit2
-  {
-    // used to store the Stream State settings when sending/receiving
-    private List<ISetting> CurrentSettings { get; set; }
-    public override bool CanPreviewSend => true;
-
-    public override void PreviewSend(StreamState state, ProgressViewModel progress)
-    {
-      var filterObjs = GetSelectionFilterObjects(state.Filter);
-      foreach (var filterObj in filterObjs)
-      {
-        var converter = (ISpeckleConverter)Activator.CreateInstance(Converter.GetType());
-        var descriptor = ConnectorRevitUtils.ObjectDescriptor(filterObj);
-        var reportObj = new ApplicationObject(filterObj.UniqueId, descriptor);
-        if (!converter.CanConvertToSpeckle(filterObj))
-          reportObj.Update(status: ApplicationObject.State.Skipped, logItem: $"Sending this object type is not supported in Revit");
-        else
-          reportObj.Update(status: ApplicationObject.State.Created);
-        progress.Report.Log(reportObj);
-      }
-      SelectClientObjects(filterObjs.Select(o => o.UniqueId).ToList());
-    }
-
-    /// <summary>
-    /// Converts the Revit elements that have been added to the stream by the user, sends them to
-    /// the Server and the local DB, and creates a commit with the objects.
-    /// </summary>
-    /// <param name="state">StreamState passed by the UI</param>
-    public override async Task<string> SendStream(StreamState state, ProgressViewModel progress)
-    {
-      //make sure to instance a new copy so all values are reset correctly
-      var converter = (ISpeckleConverter)Activator.CreateInstance(Converter.GetType());
-      converter.SetContextDocument(CurrentDoc.Document);
-      converter.Report.ReportObjects.Clear();
-
-      // set converter settings as tuples (setting slug, setting selection)
-      var settings = new Dictionary<string, string>();
-      CurrentSettings = state.Settings;
-      foreach (var setting in state.Settings)
-        settings.Add(setting.Slug, setting.Selection);
-      converter.SetConverterSettings(settings);
-
-      var streamId = state.StreamId;
-      var client = state.Client;
-
-      var selectedObjects = GetSelectionFilterObjects(state.Filter);
-      state.SelectedObjectIds = selectedObjects.Select(x => x.UniqueId).ToList();
-
-      if (!selectedObjects.Any())
-      {
-        progress.Report.LogOperationError(new Exception("There are zero objects to send. Please use a filter, or set some via selection."));
-        return null;
-      }
-
-      converter.SetContextObjects(selectedObjects.Select(x => new ApplicationObject(x.UniqueId, x.GetType().ToString()) { applicationId = x.UniqueId }).ToList());
-      var commitObject = converter.ConvertToSpeckle(CurrentDoc.Document) ?? new Base();
-
-      var conversionProgressDict = new ConcurrentDictionary<string, int>();
-      conversionProgressDict["Conversion"] = 0;
-
-      progress.Max = selectedObjects.Count();
-      var convertedCount = 0;
-      foreach (var revitElement in selectedObjects)
-      {
-        var descriptor = ConnectorRevitUtils.ObjectDescriptor(revitElement);
-        // get the report object
-        // for hosted elements, they may have already been converted and added to the converter report
-        bool alreadyConverted = converter.Report.GetReportObject(revitElement.UniqueId, out int index);
-        var reportObj = alreadyConverted ?
-          converter.Report.ReportObjects[index] :
-          new ApplicationObject(revitElement.UniqueId, descriptor) { applicationId = revitElement.UniqueId };
-        if (alreadyConverted)
-        {
-          progress.Report.Log(reportObj);
-          continue;
-        }
-        try
-        {
-          if (revitElement == null)
-            continue;
-
-          if (!converter.CanConvertToSpeckle(revitElement))
-          {
-            reportObj.Update(status: ApplicationObject.State.Skipped, logItem: $"Sending this object type is not supported in Revit");
-            progress.Report.Log(reportObj);
-            continue;
-          }
-
-          if (progress.CancellationTokenSource.Token.IsCancellationRequested)
-            return null;
-
-          converter.Report.Log(reportObj); // Log object so converter can access
-          var conversionResult = converter.ConvertToSpeckle(revitElement);
-
-          conversionProgressDict["Conversion"]++;
-          progress.Update(conversionProgressDict);
-
-          convertedCount++;
-
-          if (conversionResult == null)
-          {
-            reportObj.Update(status: ApplicationObject.State.Failed, logItem: $"Conversion returned null");
-            progress.Report.Log(reportObj);
-            continue;
-          }
-
-          //is an element type, nest it under Types instead
-          if (typeof(ElementType).IsAssignableFrom(revitElement.GetType()))
-          {
-            var category = $"@{revitElement.Category.Name}";
-
-            if (commitObject["Types"] == null)
-              commitObject["Types"] = new Base();
-
-            if ((commitObject["Types"] as Base)[category] == null)
-              (commitObject["Types"] as Base)[category] = new List<Base>();
-
-            ((List<Base>)((commitObject["Types"] as Base)[category])).Add(conversionResult);
-          }
-          else
-          {
-            var category = $"@{revitElement.Category.Name}";
-            if (commitObject[category] == null)
-              commitObject[category] = new List<Base>();
-
-            ((List<Base>)commitObject[category]).Add(conversionResult);
-          }
-
-
-          reportObj.Update(status: ApplicationObject.State.Created, logItem: $"Sent as {ConnectorRevitUtils.SimplifySpeckleType(conversionResult.speckle_type)}");
-        }
-        catch (Exception e)
-        {
-          reportObj.Update(status: ApplicationObject.State.Failed, logItem: $"{e.Message}");
-        }
-        progress.Report.Log(reportObj);
-      }
-
-      progress.Report.Merge(converter.Report);
-
-      if (convertedCount == 0)
-      {
-        progress.Report.LogOperationError(new Exception("Zero objects converted successfully. Send stopped."));
-        return null;
-      }
-
-      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
-        return null;
-
-      var transports = new List<ITransport>() { new ServerTransport(client.Account, streamId) };
-
-      var objectId = await Operations.Send(
-        @object: commitObject,
-        cancellationToken: progress.CancellationTokenSource.Token,
-        transports: transports,
-        onProgressAction: dict => progress.Update(dict),
-        onErrorAction: (s, e) =>
-        {
-          progress.Report.LogOperationError(e);
-          progress.CancellationTokenSource.Cancel();
-        },
-        disposeTransports: true
-        );
-
-      if (progress.Report.OperationErrorsCount != 0)
-        return null;
-
-      if (progress.CancellationTokenSource.Token.IsCancellationRequested)
-        return null;
-
-      var actualCommit = new CommitCreateInput()
-      {
-        streamId = streamId,
-        objectId = objectId,
-        branchName = state.BranchName,
-        message = state.CommitMessage != null ? state.CommitMessage : $"Sent {convertedCount} objects from {ConnectorRevitUtils.RevitAppName}.",
-        sourceApplication = ConnectorRevitUtils.RevitAppName,
-      };
-
-      if (state.PreviousCommitId != null) { actualCommit.parents = new List<string>() { state.PreviousCommitId }; }
-      string commitId = null;
-      try
-      {
-        commitId = await client.CommitCreate(actualCommit);
-
-        //await state.RefreshStream();
-        state.PreviousCommitId = commitId;
-      }
-      catch (Exception e)
-      {
-        progress.Report.LogOperationError(e);
-      }
-
-      return commitId;
-    }
-
-  }
-}
diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.cs
deleted file mode 100644
index c6552fc029..0000000000
--- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit2/ConnectorBindingsRevit2.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Timers;
-using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-using DesktopUI2;
-using DesktopUI2.Models;
-using Speckle.ConnectorRevit.Storage;
-using Speckle.Core.Kits;
-using Speckle.Core.Models;
-using Timer = System.Timers.Timer;
-
-namespace Speckle.ConnectorRevit.UI
-{
-  public partial class ConnectorBindingsRevit2 : ConnectorBindings
-  {
-    public static UIApplication RevitApp;
-
-    public static UIDocument CurrentDoc => RevitApp.ActiveUIDocument;
-
-    public Timer SelectionTimer;
-
-    //Only use an instance of the converter as a local variable to avoid conflicts if multiple sending/receiving
-    //operations are happening at the same time
-    public ISpeckleConverter Converter { get; set; } = KitManager.GetDefaultKit().LoadConverter(ConnectorRevitUtils.RevitAppName);
-
-    public List<Exception> ConversionErrors { get; set; } = new List<Exception>();
-
-    /// <summary>
-    /// Keeps track of errors in the operations of send/receive.
-    /// </summary>
-    public List<Exception> OperationErrors { get; set; } = new List<Exception>();
-
-    public ConnectorBindingsRevit2(UIApplication revitApp) : base()
-    {
-      RevitApp = revitApp;
-    }
-
-    private void SelectionTimer_Elapsed(object sender, ElapsedEventArgs e)
-    {
-      var selectedObjects = GetSelectedObjects();
-
-      //TODO
-
-      //NotifyUi(new UpdateSelectionCountEvent() { SelectionCount = selectedObjects.Count });
-      //NotifyUi(new UpdateSelectionEvent() { ObjectIds = selectedObjects });
-    }
-
-    public override string GetHostAppNameVersion() => ConnectorRevitUtils.RevitAppName.Replace("Revit", "Revit "); //hack for ADSK store
-    public override string GetHostAppName() => HostApplications.Revit.Slug;
-
-    public override string GetDocumentId() => CurrentDoc?.Document?.GetHashCode().ToString();
-
-    public override string GetDocumentLocation() => CurrentDoc.Document.PathName;
-
-    public override string GetActiveViewName() => CurrentDoc.Document.ActiveView.Title;
-
-    public override string GetFileName() => CurrentDoc.Document.Title;
-
-    public override List<StreamState> GetStreamsInFile()
-    {
-      var streams = new List<StreamState>();
-      if (CurrentDoc != null)
-        streams = StreamStateManager2.ReadState(CurrentDoc.Document);
-
-      return streams;
-    }
-
-    public override List<ReceiveMode> GetReceiveModes()
-    {
-      return new List<ReceiveMode> { ReceiveMode.Update, ReceiveMode.Create, ReceiveMode.Ignore };
-    }
-
-    //TODO
-    public override List<MenuItem> GetCustomStreamMenuItems()
-    {
-      return new List<MenuItem>();
-    }
-
-    public override void ResetDocument()
-    {
-      // TODO!
-    }
-
-    // WARNING: Everything in the 'interop' section must match a corrosponding element in the converter
-    // which can be found in the namespace commented above the element
-    #region interop
-
-    // Objects.Structural.Geometry
-    public enum ElementType1D
-    {
-      Beam,
-      Brace,
-      Bar,
-      Column,
-      Rod,
-      Spring,
-      Tie,
-      Strut,
-      Link,
-      Damper,
-      Cable,
-      Spacer,
-      Other,
-      Null
-    }
-
-    // Objects.Structural
-    public enum PropertyType2D
-    {
-      Stress,
-      Fabric,
-      Plate,
-      Shell,
-      Curved,
-      Wall,
-      Strain,
-      Axi,
-      Load
-    }
-    #endregion
-  }
-}
diff --git a/ConnectorRevit/ConnectorRevit2019/ConnectorRevit2019.csproj b/ConnectorRevit/ConnectorRevit2019/ConnectorRevit2019.csproj
deleted file mode 100644
index 9ee0437965..0000000000
--- a/ConnectorRevit/ConnectorRevit2019/ConnectorRevit2019.csproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{EF418256-8118-47B4-8386-A945946FB92D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Speckle.ConnectorRevit</RootNamespace>
-    <AssemblyName>SpeckleConnectorRevit</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <LangVersion>8</LangVersion>
-    <StartProgram>$(ProgramW6432)\Autodesk\Revit 2019\Revit.exe</StartProgram>
-    <RevitFolderName>SpeckleRevit2</RevitFolderName>
-    <RevitVersion>2019</RevitVersion>
-    <PlatformTarget>x64</PlatformTarget>
-    <TargetFrameworkProfile />
-    <!--these four make so that the SQLite.Interop.dll is copied in the after build target-->
-    <ContentSQLiteInteropFiles>true</ContentSQLiteInteropFiles>
-    <CopySQLiteInteropFiles>false</CopySQLiteInteropFiles>
-    <CleanSQLiteInteropFiles>false</CleanSQLiteInteropFiles>
-    <CollectSQLiteInteropFiles>false</CollectSQLiteInteropFiles>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;REVIT2019</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;REVIT2019</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Avalonia">
-      <Version>0.10.18</Version>
-    </PackageReference>
-    <PackageReference Include="Avalonia.Desktop">
-      <Version>0.10.18</Version>
-    </PackageReference>
-    <PackageReference Include="Avalonia.ReactiveUI">
-      <Version>0.10.18</Version>
-    </PackageReference>
-    <PackageReference Include="ModPlus.Revit.API.2019">
-      <Version>1.0.0</Version>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="MSBuild.AssemblyVersion">
-      <Version>1.3.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Revit.Async">
-      <Version>2.0.1</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Core\Core\Core.csproj">
-      <Project>{521d4aee-08cf-4913-bbe8-5511d176d126}</Project>
-      <Name>Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj">
-      <Project>{d8576aee-6ef4-4bd7-b024-864653ec41e5}</Project>
-      <Name>AvaloniaHwndHost</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DesktopUI2\DesktopUI2\DesktopUI2.csproj">
-      <Project>{aab81f89-c71c-4f8a-b256-6a23d19134a7}</Project>
-      <Name>DesktopUI2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DesktopUI\DesktopUI\DesktopUI.csproj">
-      <Project>{a97c3046-2d55-4c49-ab40-a3c2194b82fa}</Project>
-      <Name>DesktopUI</Name>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="..\ConnectorRevit\ConnectorRevit.projitems" Label="Shared" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <IsDesktopBuild Condition="'$(IsDesktopBuild)' == ''">true</IsDesktopBuild>
-  </PropertyGroup>
-  <!-- POST BUILD EVENTS START -->
-  <Target Name="Clean">
-    <RemoveDir Directories="$(TargetDir);$(ProjectDir)\..\Release\Release2019;$(AppData)\Autodesk\Revit\Addins\2019\SpeckleRevit2" />
-  </Target>
-  <Target Name="AfterBuild">
-    <CallTarget Condition="'$(Configuration)' == 'Debug' AND '$(IsDesktopBuild)' == true" Targets="AfterBuildDebug" />
-    <CallTarget Condition="'$(Configuration)' == 'Release'" Targets="AfterBuildRelease" />
-  </Target>
-  <Target Name="AfterBuildDebug">
-    <ItemGroup>
-      <SourceDLLs Include="$(TargetDir)\**\*.*" />
-      <SourceManifest Include="$(TargetDir)*.addin" />
-    </ItemGroup>
-    <Copy DestinationFolder="$(AppData)\Autodesk\REVIT\Addins\$(RevitVersion)\$(RevitFolderName)\%(RecursiveDir)" SourceFiles="@(SourceDLLs)" />
-    <Copy DestinationFolder="$(AppData)\Autodesk\REVIT\Addins\$(RevitVersion)\" SourceFiles="@(SourceManifest)" />
-    <Message Importance="High" Text="DEBUG copy from $(TargetDir) to $(AppData)\Autodesk\REVIT\Addins\$(RevitVersion)\$(RevitFolderName)\" />
-  </Target>
-  <Target Name="AfterBuildRelease">
-    <ItemGroup>
-      <SourceDLLs Include="$(TargetDir)\**\*.*" />
-      <SourceManifest Include="$(TargetDir)*.addin" />
-    </ItemGroup>
-    <Message Importance="High" Text="RELEASE copy from $(TargetDir) to $(SolutionDir)\Release\Release$(RevitVersion)\$(RevitFolderName)\" />
-    <Copy DestinationFolder="$(SolutionDir)\Release\Release$(RevitVersion)\$(RevitFolderName)\%(RecursiveDir)" SourceFiles="@(SourceDLLs)" />
-    <Copy DestinationFolder="$(SolutionDir)\Release\Release$(RevitVersion)\" SourceFiles="@(SourceManifest)" />
-  </Target>
-  <!--END-->
-</Project>
\ No newline at end of file
diff --git a/ConnectorRevit/ConnectorRevit2020/ConnectorRevit2020.csproj b/ConnectorRevit/ConnectorRevit2020/ConnectorRevit2020.csproj
index f2b6ae2464..ccb4d30798 100644
--- a/ConnectorRevit/ConnectorRevit2020/ConnectorRevit2020.csproj
+++ b/ConnectorRevit/ConnectorRevit2020/ConnectorRevit2020.csproj
@@ -52,6 +52,8 @@
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -93,11 +95,6 @@
       <Project>{aab81f89-c71c-4f8a-b256-6a23d19134a7}</Project>
       <Name>DesktopUI2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\DesktopUI\DesktopUI\DesktopUI.csproj">
-      <Project>{a97c3046-2d55-4c49-ab40-a3c2194b82fa}</Project>
-      <Name>DesktopUI</Name>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="..\ConnectorRevit\ConnectorRevit.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ConnectorRevit/ConnectorRevit2020/Properties/AssemblyInfo.cs b/ConnectorRevit/ConnectorRevit2020/Properties/AssemblyInfo.cs
index 4a66aa619b..8bc8096eaf 100644
--- a/ConnectorRevit/ConnectorRevit2020/Properties/AssemblyInfo.cs
+++ b/ConnectorRevit/ConnectorRevit2020/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.0.0-beta")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0.0")]
diff --git a/ConnectorRevit/ConnectorRevit2021/ConnectorRevit2021.csproj b/ConnectorRevit/ConnectorRevit2021/ConnectorRevit2021.csproj
index ee9d7e88ef..30f0b4d6b8 100644
--- a/ConnectorRevit/ConnectorRevit2021/ConnectorRevit2021.csproj
+++ b/ConnectorRevit/ConnectorRevit2021/ConnectorRevit2021.csproj
@@ -52,6 +52,8 @@
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -93,11 +95,6 @@
       <Project>{aab81f89-c71c-4f8a-b256-6a23d19134a7}</Project>
       <Name>DesktopUI2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\DesktopUI\DesktopUI\DesktopUI.csproj">
-      <Project>{a97c3046-2d55-4c49-ab40-a3c2194b82fa}</Project>
-      <Name>DesktopUI</Name>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="..\ConnectorRevit\ConnectorRevit.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ConnectorRevit/ConnectorRevit2021/Properties/AssemblyInfo.cs b/ConnectorRevit/ConnectorRevit2021/Properties/AssemblyInfo.cs
index 4a66aa619b..8bc8096eaf 100644
--- a/ConnectorRevit/ConnectorRevit2021/Properties/AssemblyInfo.cs
+++ b/ConnectorRevit/ConnectorRevit2021/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.0.0-beta")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0.0")]
diff --git a/ConnectorRevit/ConnectorRevit2022/ConnectorRevit2022.csproj b/ConnectorRevit/ConnectorRevit2022/ConnectorRevit2022.csproj
index 9ed3f1def6..ca70a76e0c 100644
--- a/ConnectorRevit/ConnectorRevit2022/ConnectorRevit2022.csproj
+++ b/ConnectorRevit/ConnectorRevit2022/ConnectorRevit2022.csproj
@@ -52,6 +52,8 @@
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -70,15 +72,6 @@
       <Project>{aab81f89-c71c-4f8a-b256-6a23d19134a7}</Project>
       <Name>DesktopUI2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\DesktopUI\DesktopUI\DesktopUI.csproj">
-      <Project>{a97c3046-2d55-4c49-ab40-a3c2194b82fa}</Project>
-      <Name>DesktopUI</Name>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Objects\Converters\ConverterRevit\ConverterRevit2022\ConverterRevit2022.csproj">
-      <Project>{c74e4c61-ca68-47f9-825e-91b7a5c4546d}</Project>
-      <Name>ConverterRevit2022</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia">
diff --git a/ConnectorRevit/ConnectorRevit2022/Properties/AssemblyInfo.cs b/ConnectorRevit/ConnectorRevit2022/Properties/AssemblyInfo.cs
index 6bd84fb7d2..7f76ae24cb 100644
--- a/ConnectorRevit/ConnectorRevit2022/Properties/AssemblyInfo.cs
+++ b/ConnectorRevit/ConnectorRevit2022/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.0.0-beta")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0.0")]
 
diff --git a/ConnectorRevit/ConnectorRevit2023/ConnectorRevit2023.csproj b/ConnectorRevit/ConnectorRevit2023/ConnectorRevit2023.csproj
index 8515eaf9a7..871931bc0c 100644
--- a/ConnectorRevit/ConnectorRevit2023/ConnectorRevit2023.csproj
+++ b/ConnectorRevit/ConnectorRevit2023/ConnectorRevit2023.csproj
@@ -52,6 +52,8 @@
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -70,15 +72,6 @@
       <Project>{aab81f89-c71c-4f8a-b256-6a23d19134a7}</Project>
       <Name>DesktopUI2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\DesktopUI\DesktopUI\DesktopUI.csproj">
-      <Project>{a97c3046-2d55-4c49-ab40-a3c2194b82fa}</Project>
-      <Name>DesktopUI</Name>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Objects\Converters\ConverterRevit\ConverterRevit2023\ConverterRevit2023.csproj">
-      <Project>{c74e4c61-ca68-47f9-825e-91b7a5c4546d}</Project>
-      <Name>ConverterRevit2023</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia">
diff --git a/ConnectorRhino/ConnectorRhino.sln b/ConnectorRhino/ConnectorRhino.sln
index afa22279ea..d6c629c746 100644
--- a/ConnectorRhino/ConnectorRhino.sln
+++ b/ConnectorRhino/ConnectorRhino.sln
@@ -29,244 +29,172 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorRhino7", "Connecto
 		{6C851417-514B-4E45-9553-408377535B68} = {6C851417-514B-4E45-9553-408377535B68}
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D} = {EAA8D25F-A118-4B16-BC6C-A71463B3C53D}
 		{B74CB8C1-187B-46A6-B20B-92B8C129F3EE} = {B74CB8C1-187B-46A6-B20B-92B8C129F3EE}
+		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E} = {CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}
+		{0F1FD0C3-875F-4689-9C4A-C56E9AB31102} = {0F1FD0C3-875F-4689-9C4A-C56E9AB31102}
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2", "..\DesktopUI2\DesktopUI2\DesktopUI2.csproj", "{F7D586E0-5452-428D-B704-3FF142DE248B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorRhino6", "ConnectorRhino6\ConnectorRhino6.csproj", "{D648BB69-B992-4D34-906E-7A547374B86C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9454D346-A629-40E0-9EE2-7C6933ED1530} = {9454D346-A629-40E0-9EE2-7C6933ED1530}
+		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19} = {F1703D03-3EDB-4389-ADD9-39C52C6AEA19}
+		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D} = {EAA8D25F-A118-4B16-BC6C-A71463B3C53D}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaHwndHost", "..\DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj", "{D484DB4F-FB51-478F-B8F9-8FE3370AB392}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterGrasshopper6", "..\Objects\Converters\ConverterRhinoGh\ConverterGrasshopper6\ConverterGrasshopper6.csproj", "{9454D346-A629-40E0-9EE2-7C6933ED1530}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterGrasshopper7", "..\Objects\Converters\ConverterRhinoGh\ConverterGrasshopper7\ConverterGrasshopper7.csproj", "{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterGrasshopper7", "..\Objects\Converters\ConverterRhinoGh\ConverterGrasshopper7\ConverterGrasshopper7.csproj", "{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorGrasshopper", "..\ConnectorGrasshopper\ConnectorGrasshopper\ConnectorGrasshopper.csproj", "{109B3382-634B-408A-8A5C-4CD09CB92641}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorGrasshopper7", "..\ConnectorGrasshopper\ConnectorGrasshopper7\ConnectorGrasshopper7.csproj", "{109B3382-634B-408A-8A5C-4CD09CB92641}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9454D346-A629-40E0-9EE2-7C6933ED1530} = {9454D346-A629-40E0-9EE2-7C6933ED1530}
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E} = {CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D} = {EAA8D25F-A118-4B16-BC6C-A71463B3C53D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorGrasshopperUtils", "..\ConnectorGrasshopper\ConnectorGrasshopperUtils\ConnectorGrasshopperUtils.csproj", "{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiskTransport", "..\Core\Transports\DiskTransport\DiskTransport.csproj", "{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConnectorGrasshopperShared", "..\ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.shproj", "{0F1FD0C3-875F-4689-9C4A-C56E9AB31102}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorGrasshopper6", "..\ConnectorGrasshopper\ConnectorGrasshopper6\ConnectorGrasshopper6.csproj", "{86920221-416E-4A66-A601-3418207E2401}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9454D346-A629-40E0-9EE2-7C6933ED1530} = {9454D346-A629-40E0-9EE2-7C6933ED1530}
+		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D} = {EAA8D25F-A118-4B16-BC6C-A71463B3C53D}
+		{B74CB8C1-187B-46A6-B20B-92B8C129F3EE} = {B74CB8C1-187B-46A6-B20B-92B8C129F3EE}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorGrasshopperUtils", "..\ConnectorGrasshopper\ConnectorGrasshopperUtils\ConnectorGrasshopperUtils.csproj", "{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{0f1fd0c3-875f-4689-9c4a-c56e9ab31102}*SharedItemsImports = 13
+		..\ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{109b3382-634b-408a-8a5c-4cd09cb92641}*SharedItemsImports = 5
+		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{6c851417-514b-4e45-9553-408377535b68}*SharedItemsImports = 5
+		..\ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{86920221-416e-4a66-a601-3418207e2401}*SharedItemsImports = 5
+		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{9454d346-a629-40e0-9ee2-7c6933ed1530}*SharedItemsImports = 5
+		ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{a64acbf9-db82-4839-af99-57ed2e7989f4}*SharedItemsImports = 5
+		ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{b7376ec8-5d3e-47d2-96a7-748552f14c39}*SharedItemsImports = 13
+		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13
+		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{cae61ac4-e81a-4e69-8dd0-07b7cdf77e2e}*SharedItemsImports = 5
+		ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{d648bb69-b992-4d34-906e-7a547374b86c}*SharedItemsImports = 5
+		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{f1703d03-3edb-4389-add9-39c52c6aea19}*SharedItemsImports = 5
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug Mac|Any CPU = Debug Mac|Any CPU
-		Debug Mac|x64 = Debug Mac|x64
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
 		Release Mac|Any CPU = Release Mac|Any CPU
-		Release Mac|x64 = Release Mac|x64
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6321CA2D-5275-42A3-A034-170A0040E19E}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
 		{6321CA2D-5275-42A3-A034-170A0040E19E}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
-		{6321CA2D-5275-42A3-A034-170A0040E19E}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{6321CA2D-5275-42A3-A034-170A0040E19E}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{6321CA2D-5275-42A3-A034-170A0040E19E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6321CA2D-5275-42A3-A034-170A0040E19E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6321CA2D-5275-42A3-A034-170A0040E19E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6321CA2D-5275-42A3-A034-170A0040E19E}.Debug|x64.Build.0 = Debug|Any CPU
 		{6321CA2D-5275-42A3-A034-170A0040E19E}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{6321CA2D-5275-42A3-A034-170A0040E19E}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{6321CA2D-5275-42A3-A034-170A0040E19E}.Release Mac|x64.ActiveCfg = Release|Any CPU
-		{6321CA2D-5275-42A3-A034-170A0040E19E}.Release Mac|x64.Build.0 = Release|Any CPU
 		{6321CA2D-5275-42A3-A034-170A0040E19E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6321CA2D-5275-42A3-A034-170A0040E19E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6321CA2D-5275-42A3-A034-170A0040E19E}.Release|x64.ActiveCfg = Release|Any CPU
-		{6321CA2D-5275-42A3-A034-170A0040E19E}.Release|x64.Build.0 = Release|Any CPU
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
-		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Release Mac|x64.ActiveCfg = Release|Any CPU
-		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Release Mac|x64.Build.0 = Release|Any CPU
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Release|x64.ActiveCfg = Release|Any CPU
-		{EAA8D25F-A118-4B16-BC6C-A71463B3C53D}.Release|x64.Build.0 = Release|Any CPU
 		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Release Mac|x64.ActiveCfg = Release|Any CPU
-		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Release Mac|x64.Build.0 = Release|Any CPU
 		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Release|x64.ActiveCfg = Release|Any CPU
-		{F1703D03-3EDB-4389-ADD9-39C52C6AEA19}.Release|x64.Build.0 = Release|Any CPU
 		{6C851417-514B-4E45-9553-408377535B68}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
 		{6C851417-514B-4E45-9553-408377535B68}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
-		{6C851417-514B-4E45-9553-408377535B68}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{6C851417-514B-4E45-9553-408377535B68}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{6C851417-514B-4E45-9553-408377535B68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6C851417-514B-4E45-9553-408377535B68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C851417-514B-4E45-9553-408377535B68}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C851417-514B-4E45-9553-408377535B68}.Debug|x64.Build.0 = Debug|Any CPU
 		{6C851417-514B-4E45-9553-408377535B68}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{6C851417-514B-4E45-9553-408377535B68}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{6C851417-514B-4E45-9553-408377535B68}.Release Mac|x64.ActiveCfg = Release|Any CPU
-		{6C851417-514B-4E45-9553-408377535B68}.Release Mac|x64.Build.0 = Release|Any CPU
 		{6C851417-514B-4E45-9553-408377535B68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C851417-514B-4E45-9553-408377535B68}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C851417-514B-4E45-9553-408377535B68}.Release|x64.ActiveCfg = Release|Any CPU
-		{6C851417-514B-4E45-9553-408377535B68}.Release|x64.Build.0 = Release|Any CPU
 		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug Mac|Any CPU.ActiveCfg = Debug Mac|Any CPU
 		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug Mac|Any CPU.Build.0 = Debug Mac|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release Mac|Any CPU.ActiveCfg = Release Mac|Any CPU
 		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release Mac|Any CPU.Build.0 = Release Mac|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release Mac|x64.ActiveCfg = Release|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release Mac|x64.Build.0 = Release|Any CPU
 		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{A64ACBF9-DB82-4839-AF99-57ED2E7989F4}.Release|x64.Build.0 = Release|Any CPU
 		{F7D586E0-5452-428D-B704-3FF142DE248B}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7D586E0-5452-428D-B704-3FF142DE248B}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
-		{F7D586E0-5452-428D-B704-3FF142DE248B}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{F7D586E0-5452-428D-B704-3FF142DE248B}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{F7D586E0-5452-428D-B704-3FF142DE248B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7D586E0-5452-428D-B704-3FF142DE248B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7D586E0-5452-428D-B704-3FF142DE248B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F7D586E0-5452-428D-B704-3FF142DE248B}.Debug|x64.Build.0 = Debug|Any CPU
 		{F7D586E0-5452-428D-B704-3FF142DE248B}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{F7D586E0-5452-428D-B704-3FF142DE248B}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{F7D586E0-5452-428D-B704-3FF142DE248B}.Release Mac|x64.ActiveCfg = Release|Any CPU
-		{F7D586E0-5452-428D-B704-3FF142DE248B}.Release Mac|x64.Build.0 = Release|Any CPU
 		{F7D586E0-5452-428D-B704-3FF142DE248B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7D586E0-5452-428D-B704-3FF142DE248B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7D586E0-5452-428D-B704-3FF142DE248B}.Release|x64.ActiveCfg = Release|Any CPU
-		{F7D586E0-5452-428D-B704-3FF142DE248B}.Release|x64.Build.0 = Release|Any CPU
 		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug Mac|Any CPU.ActiveCfg = Debug Mac|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D648BB69-B992-4D34-906E-7A547374B86C}.Release Mac|Any CPU.ActiveCfg = Release Mac|Any CPU
 		{D648BB69-B992-4D34-906E-7A547374B86C}.Release Mac|Any CPU.Build.0 = Release Mac|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Release Mac|x64.ActiveCfg = Release|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Release Mac|x64.Build.0 = Release|Any CPU
 		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|x64.ActiveCfg = Release|Any CPU
-		{D648BB69-B992-4D34-906E-7A547374B86C}.Release|x64.Build.0 = Release|Any CPU
 		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
-		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Debug|x64.Build.0 = Debug|Any CPU
 		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
-		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Release Mac|x64.ActiveCfg = Release|Any CPU
-		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Release Mac|x64.Build.0 = Release|Any CPU
 		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Release|x64.ActiveCfg = Release|Any CPU
-		{D484DB4F-FB51-478F-B8F9-8FE3370AB392}.Release|x64.Build.0 = Release|Any CPU
 		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
-		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Debug|x64.Build.0 = Debug|Any CPU
 		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Release Mac|x64.ActiveCfg = Debug|Any CPU
-		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Release Mac|x64.Build.0 = Debug|Any CPU
 		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Release|x64.ActiveCfg = Release|Any CPU
-		{9454D346-A629-40E0-9EE2-7C6933ED1530}.Release|x64.Build.0 = Release|Any CPU
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
-		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Debug|x64.Build.0 = Debug|Any CPU
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Release Mac|x64.ActiveCfg = Debug|Any CPU
-		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Release Mac|x64.Build.0 = Debug|Any CPU
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Release|x64.ActiveCfg = Release|Any CPU
-		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E}.Release|x64.Build.0 = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug Mac|x64.Build.0 = Debug|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug Mac|Any CPU.ActiveCfg = Debug Mac|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug Mac|Any CPU.Build.0 = Debug Mac|Any CPU
 		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Debug|x64.Build.0 = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release Mac|x64.ActiveCfg = Debug|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release Mac|x64.Build.0 = Debug|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release Mac|Any CPU.ActiveCfg = Release Mac|Any CPU
+		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release Mac|Any CPU.Build.0 = Release Mac|Any CPU
 		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|Any CPU.Build.0 = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|x64.ActiveCfg = Release|Any CPU
-		{109B3382-634B-408A-8A5C-4CD09CB92641}.Release|x64.Build.0 = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug Mac|x64.Build.0 = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|x64.Build.0 = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release Mac|x64.ActiveCfg = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release Mac|x64.Build.0 = Debug|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|x64.ActiveCfg = Release|Any CPU
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|x64.Build.0 = Release|Any CPU
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
-		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Debug Mac|x64.ActiveCfg = Debug|Any CPU
-		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Debug Mac|x64.Build.0 = Debug|Any CPU
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Release Mac|Any CPU.Build.0 = Release|Any CPU
-		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Release Mac|x64.ActiveCfg = Debug|Any CPU
-		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Release Mac|x64.Build.0 = Debug|Any CPU
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Release|x64.ActiveCfg = Release|Any CPU
-		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB}.Release|x64.Build.0 = Release|Any CPU
+		{86920221-416E-4A66-A601-3418207E2401}.Debug Mac|Any CPU.ActiveCfg = Debug Mac|Any CPU
+		{86920221-416E-4A66-A601-3418207E2401}.Debug Mac|Any CPU.Build.0 = Debug Mac|Any CPU
+		{86920221-416E-4A66-A601-3418207E2401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86920221-416E-4A66-A601-3418207E2401}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86920221-416E-4A66-A601-3418207E2401}.Release Mac|Any CPU.ActiveCfg = Release Mac|Any CPU
+		{86920221-416E-4A66-A601-3418207E2401}.Release Mac|Any CPU.Build.0 = Release Mac|Any CPU
+		{86920221-416E-4A66-A601-3418207E2401}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86920221-416E-4A66-A601-3418207E2401}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release Mac|Any CPU.Build.0 = Release|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -285,20 +213,10 @@ Global
 		{9454D346-A629-40E0-9EE2-7C6933ED1530} = {F415936B-1E0C-4218-B8A8-E54F15549BBB}
 		{CAE61AC4-E81A-4E69-8DD0-07B7CDF77E2E} = {F415936B-1E0C-4218-B8A8-E54F15549BBB}
 		{109B3382-634B-408A-8A5C-4CD09CB92641} = {E591AEAC-C9ED-4DB3-9188-0B74FFAF7F39}
-		{E2A8E961-6DB6-4474-9E31-0C00FEB4A067} = {1E404CB8-22F1-439D-B58E-C23B14A45158}
 		{E20D7D1E-0FF7-49A5-9AA9-9430901F92BB} = {1E404CB8-22F1-439D-B58E-C23B14A45158}
+		{86920221-416E-4A66-A601-3418207E2401} = {E591AEAC-C9ED-4DB3-9188-0B74FFAF7F39}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1BFED19F-741B-4E11-95C0-753E2058B3D2}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{6c851417-514b-4e45-9553-408377535b68}*SharedItemsImports = 5
-		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{9454d346-a629-40e0-9ee2-7c6933ed1530}*SharedItemsImports = 5
-		ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{a64acbf9-db82-4839-af99-57ed2e7989f4}*SharedItemsImports = 5
-		ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{b7376ec8-5d3e-47d2-96a7-748552f14c39}*SharedItemsImports = 13
-		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13
-		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{cae61ac4-e81a-4e69-8dd0-07b7cdf77e2e}*SharedItemsImports = 5
-		ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{d648bb69-b992-4d34-906e-7a547374b86c}*SharedItemsImports = 5
-		..\Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{f1703d03-3edb-4389-add9-39c52c6aea19}*SharedItemsImports = 5
-	EndGlobalSection
 EndGlobal
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/BIMElements/BIMElementCommands.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/BIMElements/BIMElementCommands.cs
index 7550cfcf34..74ba7d4c9e 100644
--- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/BIMElements/BIMElementCommands.cs
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/BIMElements/BIMElementCommands.cs
@@ -20,8 +20,7 @@ public class SpeckleBIM
     // TODO: address consistency weak point, since this string needs to match exactly in ConverterRhinoGH.Geometry.cs!
     static string SpeckleSchemaKey = "SpeckleSchema";
     static string DirectShapeKey = "DirectShape";
-    public RhinoDoc ActiveDoc = null;
-
+    
     public class AutomaticBIM : Command
     {
       public override string EnglishName => "CreateAutomatic";
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/ConnectorRhinoShared.projitems b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/ConnectorRhinoShared.projitems
index e359561606..a926a2aa38 100644
--- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/ConnectorRhinoShared.projitems
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/ConnectorRhinoShared.projitems
@@ -11,26 +11,37 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)BIMElements\BIMElementCommands.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)BIMElements\BIMElementFilter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Entry\ConnectorRhinoCommandWin.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Entry\SpeckleMappingsCommandWin.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Entry\SpeckleCommandWin.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entry\Plugin.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UI\MappingBindingsRhino.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\ConnectorBindingsRhino.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Utils.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MacOSHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Entry\ConnectorRhinoCommandMac.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Entry\SpeckleCommandMac.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Entry\SpeckleMappingsCommandMac.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
-    <Page Include="$(MSBuildThisFileDirectory)UI\Panel.xaml">
+
+    <Page Include="$(MSBuildThisFileDirectory)UI\DuiPanel.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="$(MSBuildThisFileDirectory)UI\DuiPanel.xaml.cs">
+      <DependentUpon>DuiPanel.xaml</DependentUpon>
+    </Compile>
+    <Page Include="$(MSBuildThisFileDirectory)UI\MappingsPanel.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="$(MSBuildThisFileDirectory)UI\Panel.xaml.cs">
-        <DependentUpon>Panel.xaml</DependentUpon>
+    <Compile Include="$(MSBuildThisFileDirectory)UI\MappingsPanel.xaml.cs">
+      <DependentUpon>MappingsPanel.xaml</DependentUpon>
     </Compile>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources.resx">
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -38,7 +49,9 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
+
+   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)Resources\icon.ico" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/Plugin.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/Plugin.cs
index 62facd225e..0914c288e7 100644
--- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/Plugin.cs
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/Plugin.cs
@@ -7,6 +7,8 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
 using ConnectorRhinoShared;
+using DesktopUI2.ViewModels.MappingTool;
+using DesktopUI2.Views;
 using Rhino;
 using Rhino.PlugIns;
 using Rhino.Runtime;
@@ -26,6 +28,10 @@ public class SpeckleRhinoConnectorPlugin : PlugIn
     private static string SpeckleKey = "speckle2";
 
     public ConnectorBindingsRhino Bindings { get; private set; }
+    public MappingBindingsRhino MappingBindings { get; private set; }
+
+    private bool SelectionExpired = false;
+    internal bool ExistingSchemaLogExpired = false;
 
 
     public static AppBuilder appBuilder;
@@ -50,9 +56,18 @@ public void Init()
 
 
         Bindings = new ConnectorBindingsRhino();
+        MappingBindings = new MappingBindingsRhino();
 
         RhinoDoc.BeginOpenDocument += RhinoDoc_BeginOpenDocument;
         RhinoDoc.EndOpenDocument += RhinoDoc_EndOpenDocument;
+
+        //Mapping tool selection
+        RhinoDoc.ActiveDocumentChanged += RhinoDoc_ActiveDocumentChanged;
+        RhinoDoc.SelectObjects += (sender, e) => SelectionExpired = true;
+        RhinoDoc.DeselectObjects += (sender, e) => SelectionExpired = true;
+        RhinoDoc.DeselectAllObjects += (sender, e) => SelectionExpired = true;
+        RhinoDoc.DeleteRhinoObject += (sender, e) => ExistingSchemaLogExpired = true;
+        RhinoApp.Idle += RhinoApp_Idle;
       }
       catch (Exception ex)
       {
@@ -118,7 +133,8 @@ private void RhinoDoc_EndOpenDocument(object sender, DocumentOpenEventArgs e)
           RhinoApp.CommandLineOut.WriteLine($"Speckle error - {ex.ToFormattedString()}");
         }
 #else
-        Rhino.UI.Panels.OpenPanel(typeof(Panel).GUID);
+        Rhino.UI.Panels.OpenPanel(typeof(DuiPanel).GUID);
+        Rhino.UI.Panels.OpenPanel(typeof(MappingsPanel).GUID);
 #endif
 
       }
@@ -156,8 +172,11 @@ protected override LoadReturnCode OnLoad(ref string errorMessage)
       Init();
 
 #if !MAC
-      System.Type panelType = typeof(Panel);
+      System.Type panelType = typeof(DuiPanel);
       Rhino.UI.Panels.RegisterPanel(this, panelType, "Speckle", Resources.icon);
+
+      System.Type mappingsPanelType = typeof(MappingsPanel);
+      Rhino.UI.Panels.RegisterPanel(this, mappingsPanelType, "Speckle Mapping Tool", Resources.icon);
 #endif
       // Get the version number of our plugin, that was last used, from our settings file.
       var plugin_version = Settings.GetString("PlugInVersion", null);
@@ -198,5 +217,58 @@ protected override LoadReturnCode OnLoad(ref string errorMessage)
       return LoadReturnCode.Success;
     }
     public override PlugInLoadTime LoadTime => PlugInLoadTime.AtStartup;
+
+
+    private void RhinoApp_Idle(object sender, EventArgs e)
+    {
+
+      //do not hog rhino, to be refractored a bit
+      if (MappingsViewModel.Instance == null)
+        return;
+
+#if !MAC
+      if (!Rhino.UI.Panels.GetOpenPanelIds().Contains(typeof(MappingsPanel).GUID))
+        return;
+#else
+      if (SpeckleMappingsCommandMac.MainWindow == null || !SpeckleMappingsCommandMac.MainWindow.IsVisible)
+        return;
+#endif
+
+      try
+      {
+        if (SelectionExpired && MappingBindings.UpdateSelection != null)
+        {
+          SelectionExpired = false;
+          MappingBindings.UpdateSelection(MappingBindings.GetSelectionInfo());
+        }
+
+        if (ExistingSchemaLogExpired && MappingBindings.UpdateExistingSchemaElements != null)
+        {
+          ExistingSchemaLogExpired = false;
+          MappingBindings.UpdateExistingSchemaElements(MappingBindings.GetExistingSchemaElements());
+        }
+      }
+      catch (Exception ex)
+      {
+
+      }
+
+
+    }
+    private void RhinoDoc_DeselectObjects(object sender, Rhino.DocObjects.RhinoObjectSelectionEventArgs e)
+    {
+      SelectionExpired = true;
+    }
+
+    private void RhinoDoc_SelectObjects(object sender, Rhino.DocObjects.RhinoObjectSelectionEventArgs e)
+    {
+      SelectionExpired = true;
+    }
+
+    private void RhinoDoc_ActiveDocumentChanged(object sender, DocumentEventArgs e)
+    {
+      SelectionExpired = true;
+      // TODO: Parse new doc for existing stuff
+    }
   }
 }
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommandMac.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleCommandMac.cs
similarity index 100%
rename from ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommandMac.cs
rename to ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleCommandMac.cs
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommandWin.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleCommandWin.cs
similarity index 90%
rename from ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommandWin.cs
rename to ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleCommandWin.cs
index b28f043991..9466f6f8ee 100644
--- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommandWin.cs
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleCommandWin.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.InteropServices;
 using System.Threading;
 using Avalonia;
@@ -12,7 +12,7 @@
 
 namespace SpeckleRhino
 {
-  #if !MAC
+#if !MAC
   public class SpeckleCommandWin : Command
   {
 
@@ -31,7 +31,7 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode)
       try
       {
 
-        Rhino.UI.Panels.OpenPanel(typeof(Panel).GUID);
+        Rhino.UI.Panels.OpenPanel(typeof(DuiPanel).GUID);
         return Result.Success;
       }
       catch (Exception e)
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleMappingsCommandMac.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleMappingsCommandMac.cs
new file mode 100644
index 0000000000..55071ae085
--- /dev/null
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleMappingsCommandMac.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.ReactiveUI;
+using DesktopUI2.ViewModels;
+using DesktopUI2.ViewModels.MappingTool;
+using DesktopUI2.Views;
+using Rhino;
+using Rhino.Commands;
+using Speckle.Core.Models.Extensions;
+
+namespace SpeckleRhino
+{
+#if MAC
+  public class SpeckleMappingsCommandMac : Command
+  {
+
+    public static SpeckleMappingsCommandMac Instance { get; private set; }
+
+    public override string EnglishName => "SpeckleMappings";
+    public static Window MainWindow { get; private set; }
+
+    public SpeckleMappingsCommandMac()
+    {
+      Instance = this;
+    }
+
+    protected override Result RunCommand(RhinoDoc doc, RunMode mode)
+    {
+
+      try
+      {
+        if (MainWindow == null)
+        {
+          var viewModel = new MappingsViewModel(SpeckleRhinoConnectorPlugin.Instance.MappingBindings);
+          MainWindow = new MappingsWindow
+          {
+            DataContext = viewModel
+          };
+        }
+
+        MainWindow.Show();
+        MainWindow.Activate();
+        return Result.Success;
+      }
+      catch (Exception e)
+      {
+        RhinoApp.CommandLineOut.WriteLine($"Speckle Error - {e.ToFormattedString()}");
+        return Result.Failure;
+      }
+    }
+
+
+
+  }
+#endif
+}
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleMappingsCommandWin.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleMappingsCommandWin.cs
new file mode 100644
index 0000000000..97a3dceb21
--- /dev/null
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/SpeckleMappingsCommandWin.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.ReactiveUI;
+using DesktopUI2.ViewModels;
+using DesktopUI2.Views;
+using Rhino;
+using Rhino.Commands;
+using Speckle.Core.Models.Extensions;
+
+namespace SpeckleRhino
+{
+#if !MAC
+  public class SpeckleMappingsCommandWin : Command
+  {
+
+    public static SpeckleMappingsCommandWin Instance { get; private set; }
+
+    public override string EnglishName => "SpeckleMappings";
+
+    public SpeckleMappingsCommandWin()
+    {
+      Instance = this;
+    }
+
+    protected override Result RunCommand(RhinoDoc doc, RunMode mode)
+    {
+
+      try
+      {
+
+        Rhino.UI.Panels.OpenPanel(typeof(MappingsPanel).GUID);
+        return Result.Success;
+      }
+      catch (Exception e)
+      {
+        RhinoApp.CommandLineOut.WriteLine($"Speckle Error - { e.ToFormattedString() }");
+        return Result.Failure;
+      }
+    }
+
+  }
+#endif
+}
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.cs
index 888846e344..79012eb3ed 100644
--- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.cs
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.cs
@@ -238,6 +238,9 @@ public override async Task<Dictionary<string, List<MappingValue>>> ImportFamilyC
 
     #region receiving 
     public override bool CanPreviewReceive => true;
+
+    private static bool IsPreviewIgnore(Base @object) => @object.speckle_type.Contains("Block") || @object.speckle_type.Contains("View");
+    
     public override async Task<StreamState> PreviewReceive(StreamState state, ProgressViewModel progress)
     {
       // first check if commit is the same and preview objects have already been generated
@@ -277,7 +280,7 @@ public override async Task<StreamState> PreviewReceive(StreamState state, Progre
           previewObj.CreatedIds = new List<string>() { previewObj.OriginalId }; // temporary store speckle id as created id for Preview report selection to work
 
           var storedObj = StoredObjects[previewObj.OriginalId];
-          if (storedObj.speckle_type.Contains("Block") || storedObj.speckle_type.Contains("View"))
+          if(IsPreviewIgnore(storedObj))
           {
             var status = previewObj.Convertible ? ApplicationObject.State.Created : ApplicationObject.State.Skipped;
             previewObj.Update(status: status, logItem: "No preview available");
@@ -286,12 +289,12 @@ public override async Task<StreamState> PreviewReceive(StreamState state, Progre
           }
 
           if (previewObj.Convertible)
-            previewObj.Converted = ConvertObject(previewObj, converter);
+            previewObj.Converted = ConvertObject(storedObj, converter);
           else
             foreach (var fallback in previewObj.Fallback)
             {
-              fallback.Converted = ConvertObject(fallback, converter);
-              previewObj.Log.AddRange(fallback.Log);
+              var storedFallback = StoredObjects[fallback.OriginalId];
+              fallback.Converted = ConvertObject(storedFallback, converter);
             }
 
           if (previewObj.Converted == null || previewObj.Converted.Count == 0)
@@ -382,8 +385,6 @@ public override async Task<StreamState> ReceiveStream(StreamState state, Progres
       if (progress.Report.OperationErrorsCount != 0)
         return null;
 
-
-
       RhinoApp.InvokeOnUiThread((Action)delegate
       {
         RhinoDoc.ActiveDoc.Notes += "%%%" + commitLayerName; // give converter a way to access commit layer info
@@ -399,13 +400,28 @@ public override async Task<StreamState> ReceiveStream(StreamState state, Progres
           foreach (var previewObj in Preview)
           {
             if (previewObj.Convertible)
-              previewObj.Converted = ConvertObject(previewObj, converter);
+            {
+              var storedObj = StoredObjects[previewObj.OriginalId];
+              if (storedObj == null)
+              {
+                previewObj.Update(status: ApplicationObject.State.Failed,
+                  logItem: $"Couldn't retrieve stored object from bindings");
+                continue;
+              }
+              
+              if (!IsPreviewIgnore(storedObj))
+              {
+                previewObj.Converted = ConvertObject(storedObj, converter);
+              }
+            }
             else
+            {
               foreach (var fallback in previewObj.Fallback)
               {
-                fallback.Converted = ConvertObject(fallback, converter);
-                previewObj.Log.AddRange(fallback.Log);
+                var storedFallback = StoredObjects[ fallback.OriginalId ];
+                fallback.Converted = ConvertObject(storedFallback, converter);
               }
+            }
 
             if (previewObj.Converted == null || previewObj.Converted.Count == 0)
             {
@@ -432,10 +448,13 @@ public override async Task<StreamState> ReceiveStream(StreamState state, Progres
 
           // check receive mode & if objects need to be removed from the document after bake (or received objs need to be moved layers)
           var toRemove = new List<RhinoObject>();
+          var layer = previewObj.Container;
           switch (state.ReceiveMode)
           {
             case ReceiveMode.Update: // existing objs will be removed if it exists in the received commit
               toRemove = GetObjectsByApplicationId(previewObj.applicationId);
+              if (toRemove.Any())
+                layer = Doc.Layers[toRemove.First().Attributes.LayerIndex].FullPath;
               toRemove.ForEach(o => Doc.Objects.Delete(o));
               break;
             default:
@@ -448,11 +467,16 @@ public override async Task<StreamState> ReceiveStream(StreamState state, Progres
           previewObj.CreatedIds.Clear(); // clear created ids before bake because these may be speckle ids from the preview
 
           if (previewObj.Convertible)
-            BakeObject(previewObj, converter);
+          {
+            BakeObject(previewObj, converter, layer);
+            previewObj.Status = !previewObj.CreatedIds.Any() ? ApplicationObject.State.Failed : 
+            isUpdate ? ApplicationObject.State.Updated : 
+            ApplicationObject.State.Created;
+          }
           else
           {
             foreach (var fallback in previewObj.Fallback)
-              BakeObject(fallback, converter, previewObj);
+              BakeObject(fallback, converter, layer, previewObj);
             previewObj.Status = previewObj.Fallback.Where(o => o.Status == ApplicationObject.State.Failed).Count() == previewObj.Fallback.Count ?
               ApplicationObject.State.Failed : isUpdate ?
               ApplicationObject.State.Updated : ApplicationObject.State.Created;
@@ -477,7 +501,7 @@ public override async Task<StreamState> ReceiveStream(StreamState state, Progres
       return state;
     }
 
-    // gets objects by id directly or by applicaiton id user string
+    // gets objects by id directly or by application id user string
     private List<RhinoObject> GetObjectsByApplicationId(string applicationId)
     {
       if (string.IsNullOrEmpty(applicationId))
@@ -638,9 +662,8 @@ private List<ApplicationObject> FlattenCommitObject(object obj, ISpeckleConverte
     }
 
     // conversion and bake
-    private List<object> ConvertObject(ApplicationObject appObj, ISpeckleConverter converter)
+    private List<object> ConvertObject(Base obj, ISpeckleConverter converter)
     {
-      var obj = StoredObjects[appObj.OriginalId];
       var convertedList = new List<object>();
 
       var converted = converter.ConvertToNative(obj);
@@ -660,21 +683,20 @@ void FlattenConvertedObject(object item)
 
       return convertedList;
     }
-    private void BakeObject(ApplicationObject appObj, ISpeckleConverter converter, ApplicationObject parent = null)
+    private void BakeObject(ApplicationObject appObj, ISpeckleConverter converter, string layer, ApplicationObject parent = null)
     {
       var obj = StoredObjects[appObj.OriginalId];
       int bakedCount = 0;
       // check if this is a view or block - convert instead of bake if so (since these are "baked" during conversion)
-      if (!appObj.Converted.Any() && (obj.speckle_type.Contains("Block") || obj.speckle_type.Contains("View")))
+      if (!appObj.Converted.Any() && IsPreviewIgnore(obj))
       {
-        appObj.Converted = ConvertObject(appObj, converter);
+        appObj.Converted = ConvertObject(obj, converter);
       }
       foreach (var convertedItem in appObj.Converted)
       {
         switch (convertedItem)
         {
           case GeometryBase o:
-            string layerPath = appObj.Container;
             if (!o.IsValidWithLog(out string log))
             {
               var invalidMessage = $"{log.Replace("\n", "").Replace("\r", "")}";
@@ -684,10 +706,10 @@ private void BakeObject(ApplicationObject appObj, ISpeckleConverter converter, A
                 appObj.Update(logItem: invalidMessage);
               continue;
             }
-            Layer bakeLayer = Doc.GetLayer(layerPath, true);
+            Layer bakeLayer = Doc.GetLayer(layer, true);
             if (bakeLayer == null)
             {
-              var layerMessage = $"Could not create layer {layerPath}.";
+              var layerMessage = $"Could not create layer {layer}.";
               if (parent != null)
                 parent.Update(logItem: $"fallback {appObj.id}: {layerMessage}");
               else
@@ -910,7 +932,7 @@ public override async Task<string> SendStream(StreamState state, ProgressViewMod
           viewIndex = Doc.NamedViews.FindByName(guid); // try get view
         }
         var descriptor = obj != null ? Formatting.ObjectDescriptor(obj) : "Named View";
-        var applicationId = obj.Attributes.GetUserString(ApplicationIdKey) ?? guid;
+        var applicationId = obj?.Attributes.GetUserString(ApplicationIdKey) ?? guid;
         ApplicationObject reportObj = new ApplicationObject(guid, descriptor) { applicationId = applicationId };
 
         if (obj != null)
@@ -1150,5 +1172,58 @@ public override List<MenuItem> GetCustomStreamMenuItems()
 
     #endregion
 
+    public override bool CanOpen3DView => true;
+
+    public override async Task Open3DView(List<double> viewCoordinates, string viewName = "")
+    {
+      // Create positional objects for camera
+      Point3d cameraLocation = new Point3d(viewCoordinates[0], viewCoordinates[1], viewCoordinates[2]);
+      Point3d target = new Point3d(viewCoordinates[3], viewCoordinates[4], viewCoordinates[5]);
+      Vector3d direction = target - cameraLocation;
+
+      if (!Doc.Views.Any(v => v.ActiveViewport.Name == "SpeckleCommentView"))
+      {
+        // Get bounds from active view
+        Rectangle bounds = Doc.Views.ActiveView.ScreenRectangle;
+        // Reset margins
+        bounds.X = 0;
+        bounds.Y = 0;
+        Doc.Views.Add("SpeckleCommentView", DefinedViewportProjection.Perspective, bounds, false);
+      }
+
+      await Task.Run(() =>
+      {
+        IEnumerable<RhinoView> views = Doc.Views.Where(v => v.ActiveViewport.Name == "SpeckleCommentView");
+        if (views.Any())
+        {
+          RhinoView speckleCommentView = views.First();
+          speckleCommentView.ActiveViewport.SetCameraDirection(direction, false);
+          speckleCommentView.ActiveViewport.SetCameraLocation(cameraLocation, true);
+          
+          DisplayModeDescription shaded = DisplayModeDescription.FindByName("Shaded");
+          if (shaded!= null)
+          {
+            speckleCommentView.ActiveViewport.DisplayMode = shaded;
+          }
+
+          // Minimized all maximized views.
+          IEnumerable<RhinoView> maximizedViews = Doc.Views.Where(v => v.Maximized);
+          foreach (RhinoView view in maximizedViews)
+          {
+            view.Maximized = false;
+          }
+
+          // Maximized speckle comment view.
+          speckleCommentView.Maximized = true;
+
+          if (Doc.Views.ActiveView.ActiveViewport.Name != "SpeckleCommentView")
+          {
+            Doc.Views.ActiveView = speckleCommentView;
+          }
+        }
+
+        Doc.Views.Redraw();
+      });
+    }
   }
 }
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/Panel.xaml b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/DuiPanel.xaml
similarity index 93%
rename from ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/Panel.xaml
rename to ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/DuiPanel.xaml
index 3400dd92ce..27fc4cd059 100644
--- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/Panel.xaml
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/DuiPanel.xaml
@@ -1,9 +1,9 @@
 <UserControl
-  x:Class="SpeckleRhino.Panel"
+  x:Class="SpeckleRhino.DuiPanel"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:av="clr-namespace:AvaloniaHwndHost;assembly=AvaloniaHwndHost"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   mc:Ignorable="d">
 
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/Panel.xaml.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/DuiPanel.xaml.cs
similarity index 92%
rename from ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/Panel.xaml.cs
rename to ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/DuiPanel.xaml.cs
index 54fc691737..83dfcc03c8 100644
--- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/Panel.xaml.cs
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/DuiPanel.xaml.cs
@@ -10,9 +10,9 @@ namespace SpeckleRhino
   /// Interaction logic for Page1.xaml
   /// </summary>
   [System.Runtime.InteropServices.Guid("3EA3FEE1-216D-4076-9A06-949DE4C0E8AF")]
-  public partial class Panel : UserControl
+  public partial class DuiPanel : UserControl
   {
-    public Panel()
+    public DuiPanel()
     {
       try
       {
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingBindingsRhino.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingBindingsRhino.cs
new file mode 100644
index 0000000000..4f300f3ca1
--- /dev/null
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingBindingsRhino.cs
@@ -0,0 +1,239 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using DesktopUI2;
+using DesktopUI2.Models;
+using DesktopUI2.Models.Filters;
+using DesktopUI2.Models.Settings;
+using DesktopUI2.ViewModels;
+using DesktopUI2.ViewModels.MappingTool;
+using Rhino;
+using Rhino.Display;
+using Rhino.DocObjects;
+using Rhino.Geometry;
+using Rhino.Render;
+using Speckle.Core.Api;
+using Speckle.Core.Kits;
+using Speckle.Core.Logging;
+using Speckle.Core.Models;
+using Speckle.Core.Transports;
+using Speckle.Newtonsoft.Json;
+using static DesktopUI2.ViewModels.MappingViewModel;
+using ApplicationObject = Speckle.Core.Models.ApplicationObject;
+using Point = Rhino.Geometry.Point;
+
+namespace SpeckleRhino
+{
+
+  public partial class MappingBindingsRhino : MappingsBindings
+  {
+    static string SpeckleMappingKey = "SpeckleMapping";
+    static string SpeckleMappingViewKey = "SpeckleMappingView";
+
+    private MappingsDisplayConduit Display;
+
+    public MappingBindingsRhino()
+    {
+      Display = new MappingsDisplayConduit();
+      Display.Enabled = true;
+    }
+
+    public override MappingSelectionInfo GetSelectionInfo()
+    {
+      try
+      {
+        var selection = RhinoDoc.ActiveDoc.Objects.GetSelectedObjects(false, false).ToList();
+        var result = new List<Schema>();
+
+        foreach (var obj in selection)
+        {
+          var schemas = GetObjectSchemas(obj);
+
+          if (!result.Any())
+            result = schemas;
+          else
+            //intersect lists
+            //TODO: if some elements already have a schema and values are different
+            //we should default to an empty schema, instead of potentially restoring the one with values
+            result = result.Where(x => schemas.Any(y => y.Name == x.Name)).ToList();
+
+          //incompatible selection
+          if (!result.Any())
+            return new MappingSelectionInfo(new List<Schema>(), selection.Count);
+        }
+
+        return new MappingSelectionInfo(result, selection.Count);
+
+      }
+      catch (Exception ex)
+      {
+        return new MappingSelectionInfo(new List<Schema>(), 0);
+      }
+    }
+
+    /// <summary>
+    /// For a give Rhino Object find all applicable schemas and retrive any existing one already applied
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    private List<Schema> GetObjectSchemas(RhinoObject obj)
+    {
+      var result = new List<Schema>();
+
+      var existingSchema = GetExistingObjectSchema(obj);
+      if (existingSchema != null)
+        result.Add(existingSchema);
+
+      if (obj is InstanceObject)
+      {
+        result.Add(new RevitFamilyInstanceViewModel());
+      }
+      else
+      {
+        switch (obj.Geometry)
+        {
+          case Mesh m:
+            if (!result.Any(x => typeof(DirectShapeFreeformViewModel) == x.GetType()))
+              result.Add(new DirectShapeFreeformViewModel());
+            break;
+
+          case Brep b:
+            if (!result.Any(x => typeof(DirectShapeFreeformViewModel) == x.GetType()))
+              result.Add(new DirectShapeFreeformViewModel());
+            break;
+          case Extrusion e:
+            if (e.ProfileCount > 1) break;
+            var crv = e.Profile3d(new ComponentIndex(ComponentIndexType.ExtrusionBottomProfile, 0));
+            if (!(crv.IsLinear() || crv.IsArc())) break;
+            if (crv.PointAtStart.Z != crv.PointAtEnd.Z) break;
+
+            if (!result.Any(x => typeof(RevitWallViewModel) == x.GetType()))
+              result.Add(new RevitWallViewModel());
+            break;
+
+          case Curve c:
+            if (c.IsLinear())
+            {
+              result.Add(new RevitBeamViewModel());
+              result.Add(new RevitBraceViewModel());
+            }
+
+            //if (c.IsLinear() && c.PointAtEnd.Z == c.PointAtStart.Z) cats.Add(Gridline);
+            //if (c.IsLinear() && c.PointAtEnd.X == c.PointAtStart.X && c.PointAtEnd.Y == c.PointAtStart.Y) cats.Add(Column);
+            //if (c.IsArc() && !c.IsCircle() && c.PointAtEnd.Z == c.PointAtStart.Z) cats.Add(Gridline);
+            break;
+
+          case Point p:
+            result.Add(new RevitFamilyInstanceViewModel());
+            break;
+        }
+      }
+
+      return result;
+    }
+
+    private Schema GetExistingObjectSchema(RhinoObject obj)
+    {
+      var viewModel = obj.Attributes.GetUserString(SpeckleMappingViewKey);
+
+      if (string.IsNullOrEmpty(viewModel))
+        return null;
+
+      try
+      {
+        var settings = new JsonSerializerSettings()
+        {
+          TypeNameHandling = TypeNameHandling.All
+        };
+
+        return JsonConvert.DeserializeObject<Schema>(viewModel, settings);
+
+      }
+      catch
+      {
+        return null;
+      }
+    }
+
+    public override void SetMappings(string schema, string viewModel)
+    {
+      var selection = RhinoDoc.ActiveDoc.Objects.GetSelectedObjects(false, false).ToList();
+      foreach (var obj in selection)
+      {
+        obj.Attributes.SetUserString(SpeckleMappingKey, schema);
+        obj.Attributes.SetUserString(SpeckleMappingViewKey, viewModel);
+      }
+
+      SpeckleRhinoConnectorPlugin.Instance.ExistingSchemaLogExpired = true;
+
+    }
+
+    public override void ClearMappings()
+    {
+      var selection = RhinoDoc.ActiveDoc.Objects.GetSelectedObjects(false, false).ToList();
+
+      foreach (var obj in selection)
+      {
+        try
+        {
+          obj.Attributes.DeleteUserString(SpeckleMappingKey);
+          obj.Attributes.DeleteUserString(SpeckleMappingViewKey);
+        }
+        catch { }
+      }
+      SpeckleRhinoConnectorPlugin.Instance.ExistingSchemaLogExpired = true;
+    }
+
+    public override List<Schema> GetExistingSchemaElements()
+    {
+      var settings = new JsonSerializerSettings()
+      {
+        TypeNameHandling = TypeNameHandling.All
+      };
+
+      var objects = RhinoDoc.ActiveDoc.Objects.FindByUserString(SpeckleMappingViewKey, "*", true);
+      var schemas = objects.Select(obj => JsonConvert.DeserializeObject<Schema>(obj.Attributes.GetUserString(SpeckleMappingViewKey), settings)).ToList();
+
+
+      //add the object id to the schema so we can easily highlight/clear them
+      for (var i = 0; i < schemas.Count; i++)
+      {
+        schemas[i].ApplicationId = objects[i].Id.ToString();
+      }
+
+
+      return schemas;
+    }
+
+    public override void HighlightElements(List<string> ids)
+    {
+      try
+      {
+        Display.ObjectIds = ids;
+        RhinoDoc.ActiveDoc?.Views.Redraw();
+      }
+      catch (Exception ex)
+      {
+        //fail silently
+      }
+    }
+
+    public override void SelectElements(List<string> ids)
+    {
+      try
+      {
+        RhinoDoc.ActiveDoc.Objects.Select(ids.Select(x => Guid.Parse(x)));
+      }
+      catch (Exception ex)
+      {
+        //fail silently
+      }
+    }
+  }
+}
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingsPanel.xaml b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingsPanel.xaml
new file mode 100644
index 0000000000..2548502045
--- /dev/null
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingsPanel.xaml
@@ -0,0 +1,13 @@
+<UserControl
+  x:Class="SpeckleRhino.MappingsPanel"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:av="clr-namespace:AvaloniaHwndHost;assembly=AvaloniaHwndHost"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  mc:Ignorable="d">
+
+  <Grid>
+    <av:AvaloniaHwndHost x:Name="AvaloniaHost" />
+  </Grid>
+</UserControl>
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingsPanel.xaml.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingsPanel.xaml.cs
new file mode 100644
index 0000000000..0d036dba45
--- /dev/null
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/MappingsPanel.xaml.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using DesktopUI2.ViewModels.MappingTool;
+using DesktopUI2.Views;
+
+namespace SpeckleRhino
+{
+  /// <summary>
+  /// Interaction logic for Page1.xaml
+  /// </summary>
+  [System.Runtime.InteropServices.Guid("0EB2F55E-CEB2-4112-8248-EED17ED66CD3")]
+  public partial class MappingsPanel : UserControl
+  {
+    public MappingsPanel()
+    {
+      try
+      {
+        InitializeComponent();
+        //set here otherwise we get errors about re-used visual parents when closing and re-opening the panel
+        //there might be other solutions too. If changing this behaviour make sure to refresh the view model
+        //when opening a new file as well
+        var viewModel = new MappingsViewModel(SpeckleRhinoConnectorPlugin.Instance.MappingBindings);
+        this.DataContext = viewModel;
+        AvaloniaHost.Content = new MappingsControl();
+      }
+      catch (Exception ex)
+      {
+
+      }
+
+
+
+    }
+
+
+
+
+  }
+}
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Utils.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Utils.cs
index a0edd725bc..dc51be7536 100644
--- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Utils.cs
+++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Utils.cs
@@ -37,7 +37,7 @@ public static class Utils
     public static string RemoveInvalidRhinoChars(string str)
     {
       // using this to handle grasshopper branch syntax
-      string cleanStr = str.Replace("{", "").Replace("}","");
+      string cleanStr = str.Replace("{", "").Replace("}", "");
       return cleanStr;
     }
     #region extension methods
@@ -210,6 +210,46 @@ protected override void PreDrawObjects(Rhino.Display.DrawEventArgs e)
 
   #endregion
 
+  public class MappingsDisplayConduit : Rhino.Display.DisplayConduit
+  {
+    public List<string> ObjectIds { get; set; } = new List<string>();
+
+    public Color Color { get; set; } = Color.RoyalBlue;
+
+    protected override void DrawOverlay(DrawEventArgs e)
+    {
+      base.DrawOverlay(e);
+      if (!Enabled) return;
+
+      //e.Display.ZBiasMode = ZBiasMode.TowardsCamera;
+
+      foreach (var id in ObjectIds)
+      {
+        if (id == null) continue;
+        var obj = Rhino.RhinoDoc.ActiveDoc.Objects.FindId(new Guid(id));
+        switch (obj.ObjectType)
+        {
+          case ObjectType.Curve:
+            e.Display.DrawCurve((Curve)obj.Geometry, Color);
+            break;
+          case ObjectType.Mesh:
+            DisplayMaterial mMaterial = new DisplayMaterial(Color, 0.5);
+            e.Display.DrawMeshShaded(obj.Geometry as Mesh, mMaterial);
+            break;
+          case ObjectType.Extrusion:
+            DisplayMaterial eMaterial = new DisplayMaterial(Color, 0.5);
+            e.Display.DrawBrepShaded(((Extrusion)obj.Geometry).ToBrep(), eMaterial);
+            break;
+          case ObjectType.Brep:
+            DisplayMaterial bMaterial = new DisplayMaterial(Color, 0.5);
+            e.Display.DrawBrepShaded((Brep)obj.Geometry, bMaterial);
+            break;
+        }
+      }
+
+    }
+  }
+
   public static class Formatting
   {
     public static string ObjectDescriptor(RhinoObject obj)
diff --git a/ConnectorRhino/ConnectorRhino6/ConnectorRhino6.csproj b/ConnectorRhino/ConnectorRhino6/ConnectorRhino6.csproj
index 85032f033b..5104cd36fa 100644
--- a/ConnectorRhino/ConnectorRhino6/ConnectorRhino6.csproj
+++ b/ConnectorRhino/ConnectorRhino6/ConnectorRhino6.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net462</TargetFramework>
-    <Version>1.0</Version>
     <Title>SpeckleRhino</Title>
     <Description>Description of SpeckleRhino</Description>
     <TargetExt>.rhp</TargetExt>
@@ -21,10 +20,6 @@
     <EmbeddedResource Include="EmbeddedResources\**\*" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="RhinoCommon" Version="6.28.20199.17141" IncludeAssets="compile;build" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.10.18" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
@@ -37,7 +32,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\ConnectorGrasshopper\ConnectorGrasshopper\ConnectorGrasshopper.csproj" />
+    <ProjectReference Include="..\..\ConnectorGrasshopper\ConnectorGrasshopper6\ConnectorGrasshopper6.csproj" />
     <ProjectReference Include="..\..\Core\Core\Core.csproj" />
     <ProjectReference Include="..\..\DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj" />
     <ProjectReference Include="..\..\DesktopUI2\DesktopUI2\DesktopUI2.csproj" />
diff --git a/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj b/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj
index 5116070d8f..dcf5138d8c 100644
--- a/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj
+++ b/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
-    <Version>1.0</Version>
+    <Version>2.0.0-dev</Version>
     <Title>SpeckleRhino</Title>
     <Description>Description of SpeckleRhino</Description>
     <TargetExt>.rhp</TargetExt>
-    <Product>ConnectorRhino7</Product>
     <RhinoMacLauncher>/Applications/Rhino 7.app</RhinoMacLauncher>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>SpeckleConnectorRhino</AssemblyName>
     <Configurations>Debug;Release;Debug Mac;Release Mac</Configurations>
     <RootNamespace>SpeckleRhino</RootNamespace>
-    <Version>2.0.0-dev</Version>
+    <Product>ConnectorRhino7</Product>
+   
     <!--NOTE-->
   <!--
     Since Rhino uses mono we build for win-x64 also on mac
@@ -27,24 +27,24 @@
   <ItemGroup>
     <EmbeddedResource Include="EmbeddedResources\**\*" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="RhinoCommon" Version="7.4.21078.1001" IncludeAssets="compile;build" />
+    <AvaloniaXaml Remove="Properties\**" />
+    <Compile Remove="Properties\**" />
+    <EmbeddedResource Remove="Properties\**" />
+    <None Remove="Properties\**" />
   </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.10.18" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1">
-    </PackageReference>
-    <PackageReference Include="RhinoCommon" Version="7.4.21078.1001">
-    </PackageReference>
-    <PackageReference Include="RhinoWindows" Version="7.4.21078.1001">
+    <PackageReference Include="RhinoCommon" Version="7.4.21078.1001" IncludeAssets="compile;build">
+       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\ConnectorGrasshopper\ConnectorGrasshopper\ConnectorGrasshopper.csproj" />
+    <ProjectReference Include="..\..\ConnectorGrasshopper\ConnectorGrasshopper7\ConnectorGrasshopper7.csproj" />
     <ProjectReference Include="..\..\Core\Core\Core.csproj" />
     <ProjectReference Include="..\..\DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj" />
     <ProjectReference Include="..\..\DesktopUI2\DesktopUI2\DesktopUI2.csproj" />
diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2020/MainForm.cs b/ConnectorTeklaStructures/ConnectorTeklaStructures2020/MainForm.cs
index 33a1461db7..3aca4a2398 100644
--- a/ConnectorTeklaStructures/ConnectorTeklaStructures2020/MainForm.cs
+++ b/ConnectorTeklaStructures/ConnectorTeklaStructures2020/MainForm.cs
@@ -18,108 +18,109 @@ namespace Speckle.ConnectorTeklaStructures
 {
   public partial class MainForm : PluginFormBase
   {
-        // Enable inserting of objects in a model
-        private readonly Model model;
-        private static CancellationTokenSource Lifetime = null;
-        private static Avalonia.Application AvaloniaApp { get; set; }
-        public MainForm()
-        {
-            // Link to model.         
-            model = new Model();
-            Bindings = new ConnectorBindingsTeklaStructures(model);
-
-            try
-            {
-                base.Load += (s, e) => Close();
-                AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(OnAssemblyResolve);
-                CreateOrFocusSpeckle();                
-                
-            }
-            catch (Exception ex)
-            {
-                
-            }
-        }
+    // Enable inserting of objects in a model
+    private readonly Model model;
+    private static CancellationTokenSource Lifetime = null;
+    private static Avalonia.Application AvaloniaApp { get; set; }
+    public MainForm()
+    {
+      // Link to model.         
+      model = new Model();
+      Bindings = new ConnectorBindingsTeklaStructures(model);
 
-        public Model Model
-        {
-            get { return model; }
-        }
-        public static Window MainWindow { get; private set; }
-        public static ConnectorBindingsTeklaStructures Bindings { get; set; }
+      try
+      {
+        base.Load += (s, e) => Close();
+        AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(OnAssemblyResolve);
+        CreateOrFocusSpeckle();
+        Bindings.OpenTeklaStructures();
 
-        static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
-        {
-            Assembly a = null;
-            var name = args.Name.Split(',')[0];
-            string path = Path.GetDirectoryName(typeof(MainPlugin).Assembly.Location);
+      }
+      catch (Exception ex)
+      {
 
-            string assemblyFile = Path.Combine(path, name + ".dll");
+      }
+    }
+
+    public Model Model
+    {
+      get { return model; }
+    }
+    public static Window MainWindow { get; private set; }
+    public static ConnectorBindingsTeklaStructures Bindings { get; set; }
 
-            if (File.Exists(assemblyFile))
-                a = Assembly.LoadFrom(assemblyFile);
+    static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
+    {
+      Assembly a = null;
+      var name = args.Name.Split(',')[0];
+      string path = Path.GetDirectoryName(typeof(MainPlugin).Assembly.Location);
 
-            return a;
-        }
-        public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<DesktopUI2.App>()
-            .UsePlatformDetect()
-            .With(new SkiaOptions { MaxGpuResourceSizeBytes = 8096000 })
-            .With(new Win32PlatformOptions { AllowEglInitialization = true, EnableMultitouch = false })
-            .LogToTrace()
-            .UseReactiveUI();
-
-        private static void AppMain(Application app, string[] args)
+      string assemblyFile = Path.Combine(path, name + ".dll");
+
+      if (File.Exists(assemblyFile))
+        a = Assembly.LoadFrom(assemblyFile);
+
+      return a;
+    }
+    public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<DesktopUI2.App>()
+        .UsePlatformDetect()
+        .With(new SkiaOptions { MaxGpuResourceSizeBytes = 8096000 })
+        .With(new Win32PlatformOptions { AllowEglInitialization = true, EnableMultitouch = false })
+        .LogToTrace()
+        .UseReactiveUI();
+
+    private static void AppMain(Application app, string[] args)
+    {
+      //var viewModel = new MainWindowViewModel(Bindings);
+      //MainWindow = new DesktopUI2.Views.MainWindow
+      //{
+      //    DataContext = viewModel
+      //};
+      //app.Run(MainWindow);
+      //System.Threading.Tasks.Task.Run(() => app.Run(MainWindow));
+      AvaloniaApp = app;
+    }
+    //public static void CreateOrFocusSpeckle()
+    //{
+    //    if (MainWindow == null)
+    //    {
+    //        BuildAvaloniaApp().Start(AppMain, null);
+    //    }
+    //    MainWindow.Show();
+    //    MainWindow.Activate();
+    //}
+    public static void CreateOrFocusSpeckle(bool showWindow = true)
+    {
+      if (MainWindow == null)
+      {
+        BuildAvaloniaApp().Start(AppMain, null);
+        var viewModel = new MainViewModel(Bindings);
+        MainWindow = new DesktopUI2.Views.MainWindow
         {
-            //var viewModel = new MainWindowViewModel(Bindings);
-            //MainWindow = new DesktopUI2.Views.MainWindow
-            //{
-            //    DataContext = viewModel
-            //};
-            //app.Run(MainWindow);
-            //System.Threading.Tasks.Task.Run(() => app.Run(MainWindow));
-            AvaloniaApp = app;
-        }
-        //public static void CreateOrFocusSpeckle()
-        //{
-        //    if (MainWindow == null)
-        //    {
-        //        BuildAvaloniaApp().Start(AppMain, null);
-        //    }
-        //    MainWindow.Show();
-        //    MainWindow.Activate();
-        //}
-        public static void CreateOrFocusSpeckle(bool showWindow = true)
+          DataContext = viewModel
+        };
+      }
+
+      try
+      {
+        if (showWindow)
         {
-            if (MainWindow == null)
-            {
-                BuildAvaloniaApp().Start(AppMain, null);
-                var viewModel = new MainViewModel(Bindings);
-                MainWindow = new DesktopUI2.Views.MainWindow
-                {
-                    DataContext = viewModel
-                };
-            }
-
-            try
-            {
-                if (showWindow)
-                {
-                    MainWindow.Show();
-                    MainWindow.Activate();
-
-                    //required to gracefully quit avalonia and the skia processes
-                    //https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes
-                    if (Lifetime == null)
-                    {
-                        Lifetime = new CancellationTokenSource();
-                        System.Threading.Tasks.Task.Run(() => AvaloniaApp.Run(Lifetime.Token));
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-            }
+          MainWindow.Show();
+          MainWindow.Activate();
+
+          //required to gracefully quit avalonia and the skia processes
+          //https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes
+          if (Lifetime == null)
+          {
+            Lifetime = new CancellationTokenSource();
+            System.Threading.Tasks.Task.Run(() => AvaloniaApp.Run(Lifetime.Token));
+          }
         }
+      }
+      catch (Exception ex)
+      {
+      }
+    }
 
     private void MainForm_Load(object sender, EventArgs e)
     {
diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/MainForm.cs b/ConnectorTeklaStructures/ConnectorTeklaStructures2021/MainForm.cs
index ec77fdc844..79a9393d29 100644
--- a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/MainForm.cs
+++ b/ConnectorTeklaStructures/ConnectorTeklaStructures2021/MainForm.cs
@@ -27,13 +27,13 @@ public MainForm()
       // Link to model.         
       model = new Model();
       Bindings = new ConnectorBindingsTeklaStructures(model);
-
+     
       try
       {
         base.Load += (s, e) => Close();
         AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(OnAssemblyResolve);
         CreateOrFocusSpeckle();
-
+        Bindings.OpenTeklaStructures();
       }
       catch (Exception ex)
       {
diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/StreamStateManager/StreamStateManager.cs b/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/StreamStateManager/StreamStateManager.cs
index 134345aa94..a4e19487f9 100644
--- a/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/StreamStateManager/StreamStateManager.cs
+++ b/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/StreamStateManager/StreamStateManager.cs
@@ -9,6 +9,7 @@ namespace ConnectorTeklaStructures.Storage
 {
   public static class StreamStateManager
   {
+
     private static string _speckleFilePath;
     public static List<StreamState> ReadState(Model model)
     {
diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/UI/ConnectorBindingsTeklaStructure.Settings.cs b/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/UI/ConnectorBindingsTeklaStructure.Settings.cs
index 4f9b5fc31c..4d89514521 100644
--- a/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/UI/ConnectorBindingsTeklaStructure.Settings.cs
+++ b/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/UI/ConnectorBindingsTeklaStructure.Settings.cs
@@ -12,7 +12,7 @@ public partial class ConnectorBindingsTeklaStructures : ConnectorBindings
 { 
     public override List<ISetting> GetSettings()
     {
-    
+
 
       return new List<ISetting>
       {
diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/UI/ConnectorBindingsTeklaStructures.cs b/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/UI/ConnectorBindingsTeklaStructures.cs
index 4f4d42a8c9..4d8f6c36ef 100644
--- a/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/UI/ConnectorBindingsTeklaStructures.cs
+++ b/ConnectorTeklaStructures/ConnectorTeklaStructuresShared/UI/ConnectorBindingsTeklaStructures.cs
@@ -14,6 +14,12 @@ namespace Speckle.ConnectorTeklaStructures.UI
   public partial class ConnectorBindingsTeklaStructures : ConnectorBindings
 
   {
+    public void OpenTeklaStructures()
+    {
+      var streams = GetStreamsInFile();
+      if (UpdateSavedStreams != null)
+        UpdateSavedStreams(streams);
+    }
     public static Model Model { get; set; }
     public List<Exception> Exceptions { get; set; } = new List<Exception>();
     public List<StreamState> DocumentStreams { get; set; } = new List<StreamState>();
@@ -22,7 +28,9 @@ public partial class ConnectorBindingsTeklaStructures : ConnectorBindings
     public ConnectorBindingsTeklaStructures(Model model)
     {
       Model = model;
- 
+
+
+
     }
 
     public override List<ReceiveMode> GetReceiveModes()
diff --git a/Core/.gitignore b/Core/.gitignore
index 1a19453747..e0a9d91616 100644
--- a/Core/.gitignore
+++ b/Core/.gitignore
@@ -11,6 +11,8 @@ autom4te.cache/
 tarballs/
 test-results/
 
+*.tool-versions
+
 # Mac bundle stuff
 *.dmg
 *.app
diff --git a/Core/Core/Api/GraphQL/Client.GraphqlClientOperations.cs b/Core/Core/Api/GraphQL/Client.GraphqlClientOperations.cs
index d2f559f11f..4ef140ce65 100644
--- a/Core/Core/Api/GraphQL/Client.GraphqlClientOperations.cs
+++ b/Core/Core/Api/GraphQL/Client.GraphqlClientOperations.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -13,11 +13,112 @@ namespace Speckle.Core.Api
   public partial class Client
   {
 
+    /// <summary>
+    /// Gets the currently active user profile.
+    /// </summary>
+    /// <returns></returns>
+    public Task<User> ActiveUserGet() => ActiveUserGet(CancellationToken.None);
+
+    /// <summary>
+    /// Gets the currently active user profile.
+    /// </summary>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    /// <exception cref="SpeckleException"></exception>
+    public async Task<User> ActiveUserGet(CancellationToken cancellationToken)
+    {
+      try
+      {
+        var request = new GraphQLRequest
+        {
+          Query = @"query User {
+                      activeUser {
+                        id,
+                        email,
+                        name,
+                        bio,
+                        company,
+                        avatar,
+                        verified,
+                        profiles,
+                        role,
+                      }
+                    }"
+        };
+
+        var res = await GQLClient.SendMutationAsync<ActiveUserData>(request, cancellationToken).ConfigureAwait(false);
+
+        if (res.Errors != null && res.Errors.Any())
+          throw new SpeckleException(res.Errors[0].Message, res.Errors);
+
+        return res.Data.activeUser;
+      }
+      catch (Exception e)
+      {
+        throw new SpeckleException(e.Message, e);
+      }
+
+    }
+
+    /// <summary>
+    /// Get another user's profile by its user id.
+    /// </summary>
+    /// <param name="id">Id of the user you are looking for</param>
+    /// <returns></returns>
+    public Task<LimitedUser> OtherUserGet(string id) => OtherUserGet(CancellationToken.None, id);
+
+    /// <summary>
+    /// Get another user's profile by its user id.
+    /// </summary>
+    /// <param name="cancellationToken"></param>
+    /// <param name="id">Id of the user you are looking for</param>
+    /// <returns></returns>
+    /// <exception cref="SpeckleException"></exception>
+    public async Task<LimitedUser> OtherUserGet(CancellationToken cancellationToken, string id)
+    {
+      try
+      {
+        var request = new GraphQLRequest
+        {
+          Query = @"query LimitedUser($id: String!) {
+                      otherUser(id: $id){
+                        id,
+                        name,
+                        bio,
+                        company,
+                        avatar,
+                        verified,
+                        role,
+                      }
+                    }"
+        ,
+          Variables = new
+          {
+            id
+          }
+        };
+
+        var res = await GQLClient
+          .SendMutationAsync<LimitedUserData>(request, cancellationToken)
+          .ConfigureAwait(false);
+
+        if (res.Errors != null && res.Errors.Any())
+          throw new SpeckleException(res.Errors[0].Message, res.Errors);
+
+        return res.Data.otherUser;
+      }
+      catch (Exception e)
+      {
+        throw new SpeckleException(e.Message, e);
+      }
+    }
+
     /// <summary>
     /// Gets the current user.
     /// </summary>
     /// <param name="id">If provided, retrieves th user with this user Id</param>
     /// <returns></returns>
+    [Obsolete("UserGet obsolete, use ActiveUserGet or OtherUserGet", false)]
     public Task<User> UserGet(string id = "")
     {
       return UserGet(CancellationToken.None, id);
@@ -28,6 +129,7 @@ public Task<User> UserGet(string id = "")
     /// </summary>
     /// <param name="id">If provided, retrieves th user with this user Id</param>
     /// <returns></returns>
+    [Obsolete("UserGet obsolete, use ActiveUserGet or OtherUserGet", false)]
     public async Task<User> UserGet(CancellationToken cancellationToken, string id = "")
     {
       try
@@ -74,7 +176,7 @@ public async Task<User> UserGet(CancellationToken cancellationToken, string id =
     /// <param name="query">String to search for. Must be at least 3 characters</param>
     /// <param name="limit">Max number of users to return</param>
     /// <returns></returns>
-    public Task<List<User>> UserSearch(string query, int limit = 10)
+    public Task<List<LimitedUser>> UserSearch(string query, int limit = 10)
     {
       return UserSearch(CancellationToken.None, query: query, limit: limit);
     }
@@ -85,7 +187,7 @@ public Task<List<User>> UserSearch(string query, int limit = 10)
     /// <param name="query">String to search for. Must be at least 3 characters</param>
     /// <param name="limit">Max number of users to return</param>
     /// <returns></returns>
-    public async Task<List<User>> UserSearch(CancellationToken cancellationToken, string query, int limit = 10)
+    public async Task<List<LimitedUser>> UserSearch(CancellationToken cancellationToken, string query, int limit = 10)
     {
       try
       {
@@ -101,6 +203,7 @@ public async Task<List<User>> UserSearch(CancellationToken cancellationToken, st
                           company
                           avatar
                           verified
+                          role
                         }
                       }
                     }",
@@ -148,6 +251,8 @@ public async Task<List<User>> UserSearch(CancellationToken cancellationToken, st
         if (res.Errors != null && res.Errors.Any())
           throw new SpeckleException(res.Errors[0].Message, res.Errors);
 
+        if (res.Data.serverInfo.version.Contains("dev")) return new System.Version(999, 999, 999);
+
         ServerVersion = new System.Version(Regex.Replace(res.Data.serverInfo.version, "[-a-zA-Z]+", ""));
         return ServerVersion;
       }
@@ -261,7 +366,7 @@ public async Task<List<Stream>> StreamsGet(CancellationToken cancellationToken,
         var request = new GraphQLRequest
         {
           Query = $@"query User {{
-                      user{{
+                      activeUser{{
                         id,
                         email,
                         name,
@@ -297,15 +402,15 @@ public async Task<List<Stream>> StreamsGet(CancellationToken cancellationToken,
                     }}"
         };
 
-        var res = await GQLClient.SendMutationAsync<UserData>(request, cancellationToken).ConfigureAwait(false);
+        var res = await GQLClient.SendMutationAsync<ActiveUserData>(request, cancellationToken).ConfigureAwait(false);
 
         if (res.Errors != null)
           throw new SpeckleException("Could not get streams", res.Errors);
-        if (res.Data?.user == null)
+        if (res.Data?.activeUser == null)
         {
           throw new SpeckleException("User is not authenticated, or the credentials were not valid. Check the provided account is still valid, remove it from manager and add it again.");
         }
-        return res.Data.user.streams.items;
+        return res.Data.activeUser.streams.items;
       }
       catch (Exception e)
       {
@@ -331,7 +436,7 @@ public async Task<List<Stream>> FavoriteStreamsGet(CancellationToken cancellatio
         var request = new GraphQLRequest
         {
           Query = $@"query User {{
-                      user{{
+                      activeUser{{
                         id,
                         email,
                         name,
@@ -367,12 +472,12 @@ public async Task<List<Stream>> FavoriteStreamsGet(CancellationToken cancellatio
                     }}"
         };
 
-        var res = await GQLClient.SendMutationAsync<UserData>(request, cancellationToken).ConfigureAwait(false);
+        var res = await GQLClient.SendMutationAsync<ActiveUserData>(request, cancellationToken).ConfigureAwait(false);
 
         if (res.Errors != null)
           throw new SpeckleException("Could not get favorite streams", res.Errors);
 
-        return res.Data.user.favoriteStreams.items;
+        return res.Data.activeUser.favoriteStreams.items;
       }
       catch (Exception e)
       {
@@ -707,6 +812,68 @@ mutation streamUpdatePermission($permissionParams: StreamUpdatePermissionInput!)
       }
     }
 
+
+    /// <summary>
+    /// Gets the pending collaborators of a stream by id.
+    /// Requires the user to be an owner of the stream.
+    /// </summary>
+    /// <param name="id">Id of the stream to get</param>
+    /// <returns></returns>
+    public Task<Stream> StreamGetPendingCollaborators(string id)
+    {
+      return StreamGetPendingCollaborators(CancellationToken.None, id);
+    }
+
+    /// <summary>
+    /// Gets the pending collaborators of a stream by id.
+    /// Requires the user to be an owner of the stream.
+    /// </summary>
+    /// <param name="id">Id of the stream to get</param>
+    /// <param name="branchesLimit">Max number of branches to retrieve</param>
+    /// <returns></returns>
+    public async Task<Stream> StreamGetPendingCollaborators(CancellationToken cancellationToken, string id)
+    {
+      try
+      {
+        var request = new GraphQLRequest
+        {
+          Query = $@"query Stream($id: String!) {{
+                      stream(id: $id) {{
+                        id
+                        pendingCollaborators {{
+                          id
+                          inviteId
+                          title
+                          role
+                          user {{
+                            avatar
+                          }}
+                        }}
+                      }}
+                    }}",
+          Variables = new
+          {
+            id
+          }
+        };
+
+        var res = await GQLClient.SendMutationAsync<StreamData>(request, cancellationToken).ConfigureAwait(false);
+
+        if (res.Errors != null)
+          throw new SpeckleException("Could not get stream", res.Errors);
+
+        return res.Data.stream;
+      }
+      catch (SpeckleException se)
+      {
+        throw se;
+      }
+      catch (Exception e)
+      {
+        throw new SpeckleException("Could not get stream", e);
+      }
+    }
+
     /// <summary>
     /// Sends an email invite to join a stream and assigns them a collaborator role.
     /// </summary>
@@ -757,6 +924,45 @@ mutation streamInviteCreate($input: StreamInviteCreateInput!) {
       }
     }
 
+
+    /// <summary>
+    /// Cancels an invite to join a stream.
+    /// </summary>
+    /// <param name="streamId">Id of the stream</param>
+    /// <param name="inviteId">Id of the invite to cancel</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task<bool> StreamInviteCancel(string streamId, string inviteId, CancellationToken cancellationToken = default)
+    {
+      await _CheckStreamInvitesSupported(cancellationToken);
+      try
+      {
+        var request = new GraphQLRequest
+        {
+          Query =
+            @"
+            mutation streamInviteCancel( $streamId: String!, $inviteId: String! ) {
+              streamInviteCancel(streamId: $streamId, inviteId: $inviteId)
+            }",
+          Variables = new { streamId, inviteId }
+        };
+
+        var res = await GQLClient.SendMutationAsync<Dictionary<string, object>>(request).ConfigureAwait(false);
+
+        if (res.Errors != null)
+          throw new SpeckleException(
+            $"Could not cancel the invite for stream {streamId}",
+            res.Errors);
+
+        return (bool)res.Data["streamInviteCancel"];
+      }
+      catch (Exception e)
+      {
+        throw new SpeckleException(e.Message, e);
+      }
+    }
+
+
     /// <summary>
     /// Checks if Speckle Server version is at least v2.6.4 meaning stream invites are supported.
     /// </summary>
@@ -1515,9 +1721,7 @@ public async Task<Comments> StreamGetComments(CancellationToken cancellationToke
                             id
                             authorId
                             archived
-                            text {
-                              doc
-                            }
+                            rawText
                             data
                             createdAt
                             updatedAt
@@ -1534,9 +1738,7 @@ public async Task<Comments> StreamGetComments(CancellationToken cancellationToke
                                 id
                                 authorId
                                 archived
-                                text {
-                                  doc
-                                }
+                                rawText
                                 data
                                 createdAt
                                 updatedAt
diff --git a/Core/Core/Api/GraphQL/Client.Subscriptions.Stream.cs b/Core/Core/Api/GraphQL/Client.Subscriptions.Stream.cs
index 0617efcaf1..73eb39ad40 100644
--- a/Core/Core/Api/GraphQL/Client.Subscriptions.Stream.cs
+++ b/Core/Core/Api/GraphQL/Client.Subscriptions.Stream.cs
@@ -4,8 +4,8 @@
 using System.Threading.Tasks;
 using GraphQL;
 using Sentry;
-using Speckle.Core.Logging;
 using Speckle.Core.Api.SubscriptionModels;
+using Speckle.Core.Logging;
 
 namespace Speckle.Core.Api
 {
@@ -138,5 +138,48 @@ public bool HasSubscribedUserStreamRemoved
       }
     }
     #endregion
+
+    #region CommentActivity
+    public delegate void CommentActivityHandler(object sender, CommentItem e);
+    public event CommentActivityHandler OnCommentActivity;
+    public IDisposable CommentActivitySubscription;
+
+    /// <summary>
+    /// Subscribe to new comment events
+    /// </summary>
+    ///
+    public void SubscribeCommentActivity(string streamId)
+    {
+      try
+      {
+        var request = new GraphQLRequest
+        {
+          Query = $@"subscription {{ commentActivity( streamId: ""{streamId}"") {{ type comment {{ id authorId archived screenshot rawText }} }} }}",
+        };
+
+        var res = GQLClient.CreateSubscriptionStream<CommentActivityResponse>(request);
+        CommentActivitySubscription = res.Subscribe(response =>
+        {
+          if (response.Errors != null)
+            throw new SpeckleException("Could not subscribe to commentActivity", response.Errors);
+
+          if (response.Data != null)
+            OnCommentActivity(this, response.Data.commentActivity.comment);
+        });
+      }
+      catch (Exception e)
+      {
+        throw new SpeckleException(e.Message, e);
+      }
+    }
+
+    public bool HasSubscribedCommentActivity
+    {
+      get
+      {
+        return CommentActivitySubscription != null;
+      }
+    }
+    #endregion
   }
 }
diff --git a/Core/Core/Api/GraphQL/Client.cs b/Core/Core/Api/GraphQL/Client.cs
index d00e156204..1b2f6c5146 100644
--- a/Core/Core/Api/GraphQL/Client.cs
+++ b/Core/Core/Api/GraphQL/Client.cs
@@ -86,16 +86,21 @@ public Task OnWebSocketConnect(GraphQLHttpClient client)
 
     public void Dispose()
     {
-      UserStreamAddedSubscription?.Dispose();
-      UserStreamRemovedSubscription?.Dispose();
-      StreamUpdatedSubscription?.Dispose();
-      BranchCreatedSubscription?.Dispose();
-      BranchUpdatedSubscription?.Dispose();
-      BranchDeletedSubscription?.Dispose();
-      CommitCreatedSubscription?.Dispose();
-      CommitUpdatedSubscription?.Dispose();
-      CommitDeletedSubscription?.Dispose();
-      GQLClient?.Dispose();
+      try
+      {
+        UserStreamAddedSubscription?.Dispose();
+        UserStreamRemovedSubscription?.Dispose();
+        StreamUpdatedSubscription?.Dispose();
+        BranchCreatedSubscription?.Dispose();
+        BranchUpdatedSubscription?.Dispose();
+        BranchDeletedSubscription?.Dispose();
+        CommitCreatedSubscription?.Dispose();
+        CommitUpdatedSubscription?.Dispose();
+        CommitDeletedSubscription?.Dispose();
+        CommentActivitySubscription?.Dispose();
+        GQLClient?.Dispose();
+      }
+      catch { }
     }
   }
 }
diff --git a/Core/Core/Api/GraphQL/Models.cs b/Core/Core/Api/GraphQL/Models.cs
index dc98b9c972..a0aee651dd 100644
--- a/Core/Core/Api/GraphQL/Models.cs
+++ b/Core/Core/Api/GraphQL/Models.cs
@@ -117,6 +117,7 @@ public class Stream
     public int favoritesCount { get; set; }
 
     public List<Collaborator> collaborators { get; set; }
+    public List<PendingStreamCollaborator> pendingCollaborators { get; set; } = new List<PendingStreamCollaborator>();
     public Branches branches { get; set; }
 
     /// <summary>
@@ -170,6 +171,7 @@ public class PendingStreamCollaborator
     public string title { get; set; }
     public string role { get; set; }
     public User invitedBy { get; set; }
+    public User user { get; set; }
     public string token { get; set; }
   }
 
@@ -271,84 +273,38 @@ public class Streams
     public List<Stream> items { get; set; }
   }
 
-  public class User
+  public class UserBase
   {
     public string id { get; set; }
-    public string email { get; set; }
     public string name { get; set; }
     public string bio { get; set; }
     public string company { get; set; }
     public string avatar { get; set; }
-
     public bool verified { get; set; }
-
-    //public object profiles { get; set; }
     public string role { get; set; }
     public Streams streams { get; set; }
-    public Streams favoriteStreams { get; set; }
+  }
 
+  public class LimitedUser : UserBase
+  {
     public override string ToString()
     {
-      return $"User ({email} | {name} | {id})";
+      return $"Other user profile: ({name} | {id})";
     }
-  }
-
-  public class Comments
-  {
-    public int totalCount { get; set; }
-    public DateTime? cursor { get; set; }
-    public List<CommentItem> items { get; set; }
-  }
 
-  public class CommentData
-  {
-    public Comments comments { get; set; }
-    public List<double> camPos { get; set; }
-    public object filters { get; set; }
-    public Location location { get; set; }
-    public object selection { get; set; }
-    public object sectionBox { get; set; }
   }
 
-  public class CommentItem
+  public class User : UserBase
   {
-    public string id { get; set; }
-    public string authorId { get; set; }
-    public bool archived { get; set; }
-    public string screenshot { get; set; }
-    public Text text { get; set; }
-    public CommentData data { get; set; }
-    public DateTime createdAt { get; set; }
-    public DateTime updatedAt { get; set; }
-    public DateTime? viewedAt { get; set; }
-    public object reactions { get; set; }
-    public Comments replies { get; set; }
-    public List<Resource> resources { get; set; }
-  }
-
-  public partial class Text
-  {
-    public Doc Doc { get; set; }
-  }
-
-  public partial class Doc
-  {
-    public string Type { get; set; }
-    public DocContent[] Content { get; set; }
-  }
+    public string email { get; set; }
+    public Streams favoriteStreams { get; set; }
 
-  public partial class DocContent
-  {
-    public string Type { get; set; }
-    public ContentContent[] Content { get; set; }
+    public override string ToString()
+    {
+      return $"User ({email} | {name} | {id})";
+    }
   }
 
-  public partial class ContentContent
-  {
-    public string Type { get; set; }
-    //public Mark[] Marks { get; set; }
-    public string Text { get; set; }
-  }
 
   public class Resource
   {
@@ -376,6 +332,30 @@ public class UserData
     public User user { get; set; }
   }
 
+
+  /// <summary>
+  /// GraphQL DTO model for active user data
+  /// </summary>
+  public class ActiveUserData
+  {
+    /// <summary>
+    ///  User profile of the active user.
+    /// </summary>
+    public User activeUser { get; set; }
+  }
+
+
+  /// <summary>
+  /// GraphQL DTO model for limited user data. Mostly referring to other user's profile.
+  /// </summary>
+  public class LimitedUserData
+  {
+    /// <summary>
+    /// The limited user profile of another (non active user)
+    /// </summary>
+    public LimitedUser otherUser { get; set; }
+  }
+
   public class UserSearchData
   {
     public UserSearch userSearch { get; set; }
@@ -384,7 +364,7 @@ public class UserSearchData
   public class UserSearch
   {
     public string cursor { get; set; }
-    public List<User> items { get; set; }
+    public List<LimitedUser> items { get; set; }
   }
 
   public class ServerInfoResponse
@@ -417,6 +397,47 @@ public class StreamsData
     public Streams streams { get; set; }
   }
 
+  #region comments
+  public class Comments
+  {
+    public int totalCount { get; set; }
+    public DateTime? cursor { get; set; }
+    public List<CommentItem> items { get; set; }
+  }
+
+  public class CommentData
+  {
+    public Comments comments { get; set; }
+    public List<double> camPos { get; set; }
+    public object filters { get; set; }
+    public Location location { get; set; }
+    public object selection { get; set; }
+    public object sectionBox { get; set; }
+  }
+
+  public class CommentItem
+  {
+    public string id { get; set; }
+    public string authorId { get; set; }
+    public bool archived { get; set; }
+    public string screenshot { get; set; }
+    public string rawText { get; set; }
+    public CommentData data { get; set; }
+    public DateTime createdAt { get; set; }
+    public DateTime updatedAt { get; set; }
+    public DateTime? viewedAt { get; set; }
+    public object reactions { get; set; }
+    public Comments replies { get; set; }
+    public List<Resource> resources { get; set; }
+  }
+
+  public partial class ContentContent
+  {
+    public string Type { get; set; }
+    //public Mark[] Marks { get; set; }
+    public string Text { get; set; }
+  }
+
   public class CommentsData
   {
     public Comments comments { get; set; }
@@ -427,6 +448,18 @@ public class CommentItemData
     public CommentItem comment { get; set; }
   }
 
+  public class CommentActivityMessage
+  {
+    public string type { get; set; }
+    public CommentItem comment { get; set; }
+  }
+
+  public class CommentActivityResponse
+  {
+    public CommentActivityMessage commentActivity { get; set; }
+  }
+  #endregion
+
   #region manager api
 
   public class Connector
diff --git a/Core/Core/Api/Helpers.cs b/Core/Core/Api/Helpers.cs
index 117fbdf8a4..424701238c 100644
--- a/Core/Core/Api/Helpers.cs
+++ b/Core/Core/Api/Helpers.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Net.NetworkInformation;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text.Json;
@@ -164,6 +165,8 @@ public static async Task<string> Send(string stream, Base data, string message =
     public static async Task<bool> IsConnectorUpdateAvailable(string slug)
     {
 #if DEBUG
+      if (slug == "dui2")
+        slug = "revit";
       //when debugging the version is not correct, so don't bother
       return false;
 #endif
@@ -252,6 +255,7 @@ public static string PluralS(int num)
 
     /// <summary>
     /// Returns the correct location of the AppData folder where Speckle is installed. Usually this would be the user's %appdata% folder, unless the install was made for all users.
+    /// This folder contains Kits and othe data that can be shared among users of the same machine.
     /// </summary>
     /// <returns>The location of the AppData folder where Speckle is installed</returns>
     public static string InstallApplicationDataPath =>
@@ -262,38 +266,70 @@ public static string PluralS(int num)
 
 
     /// <summary>
-    /// Returns the correct location for `Environment.SpecialFolder.ApplicationData` for the current roaming user.
+    /// Envirenment Variable that allows to overwrite the <see cref="UserApplicationDataPath"/>
+    /// /// </summary>
+    private static string _speckleUserDataEnvVar = "SPECKLE_USERDATA_PATH";
+
+
+    /// <summary>
+    /// Returns the location of the User Application Data folder for the current roaming user, which contains user specific data such as accounts and cache.
     /// </summary>
     /// <returns>The location of the user's `%appdata%` folder.</returns>
-    public static string UserApplicationDataPath
-      // We combine our own path to the %appdata% folder due to solve issues with network account management in windows,
-      // where the normal `SpecialFolder.ApplicationData` would point to the `Default` user instead of the active one.
-      => RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-        ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "AppData", "Roaming")
-        : Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
+    public static string UserApplicationDataPath =>
+      !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(_speckleUserDataEnvVar)) ?
+      Environment.GetEnvironmentVariable(_speckleUserDataEnvVar) :
+      Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+
 
 
 
     /// <summary>
-    /// Checks if the user has a valid internet connection by pinging 'https://google.com'
+    /// Checks if the user has a valid internet connection by pinging cloudfare
     /// </summary>
     /// <returns>True if the user is connected to the internet, false otherwise.</returns>
     public static Task<bool> UserHasInternet()
     {
-      return Ping("https://google.com");
+      return Ping("1.1.1.1"); //cloudfare
     }
 
     /// <summary>
     /// Pings a specific url to verify it's accessible.
     /// </summary>
-    /// <param name="url">The url to ping.</param>
+    /// <param name="hostnameOrAddress">The hostname or address to ping.</param>
     /// <returns>True if the the status code is 200, false otherwise.</returns>
-    public static async Task<bool> Ping(string url)
+    public static async Task<bool> Ping(string hostnameOrAddress)
     {
       try
       {
+        Ping myPing = new Ping();
+        var hostname = (Uri.CheckHostName(hostnameOrAddress) != UriHostNameType.Unknown) ? hostnameOrAddress : (new Uri(hostnameOrAddress)).DnsSafeHost;
+        byte[] buffer = new byte[32];
+        int timeout = 1000;
+        PingOptions pingOptions = new PingOptions();
+        PingReply reply = myPing.Send(hostname, timeout, buffer, pingOptions);
+        return (reply.Status == IPStatus.Success);
+      }
+      catch (Exception)
+      {
+        return false;
+      }
+    }
+
+    /// <summary>
+    /// Pings and tries gettign data from a specific address to verify it's online.
+    /// </summary>
+    /// <param name="address">Theaddress to use.</param>
+    /// <returns>True if the the status code is 200, false otherwise.</returns>
+    public static async Task<bool> PingAndGet(string address)
+    {
+      try
+      {
+        var ping = await Ping(address);
+        if (!ping)
+          return false;
+
         HttpClient client = new HttpClient();
-        var response = await client.GetAsync(url);
+        var response = await client.GetAsync(address);
         return response.IsSuccessStatusCode;
 
       }
diff --git a/Core/Core/Core.csproj b/Core/Core/Core.csproj
index ee30cb46d0..32ddb2aa33 100644
--- a/Core/Core/Core.csproj
+++ b/Core/Core/Core.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RootNamespace>Speckle.Core</RootNamespace>
     <LangVersion>8.0</LangVersion>
@@ -58,4 +58,7 @@
       <PackagePath></PackagePath>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Web" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Core/Core/Kits/Applications.cs b/Core/Core/Kits/Applications.cs
index ef63460cc3..e8c8dc6d3b 100644
--- a/Core/Core/Kits/Applications.cs
+++ b/Core/Core/Kits/Applications.cs
@@ -133,91 +133,4 @@ public static HostApplication GetHostAppFromString(string appname)
     }
 
   }
-
-  [Obsolete("Use HostApplications instead.", true)]
-  public static class Applications
-  {
-    public const string Rhino6 = "Rhino6";
-    public const string Rhino7 = "Rhino7";
-    public const string Grasshopper = "Grasshopper";
-    public const string Revit2019 = "Revit2019";
-    public const string Revit2020 = "Revit2020";
-    public const string Revit2021 = "Revit2021";
-    public const string Revit2022 = "Revit2022";
-    public const string Revit2023 = "Revit2023";
-    public const string DynamoSandbox = "DynamoSandbox";
-    public const string DynamoRevit = "DynamoRevit";
-    public const string DynamoRevit2021 = "DynamoRevit2021";
-    public const string DynamoRevit2022 = "DynamoRevit2022";
-    public const string DynamoRevit2023 = "DynamoRevit2023";
-    public const string Unity = "Unity";
-    public const string Excel = "Excel";
-    public const string GSA = "GSA";
-    public const string Civil2021 = "Civil2021";
-    public const string Civil2022 = "Civil2022";
-    public const string Civil2023 = "Civil2023";
-    public const string Autocad2021 = "AutoCAD2021";
-    public const string Autocad2022 = "AutoCAD2022";
-    public const string Autocad2023 = "AutoCAD2023";
-    public const string MicroStation = "MicroStation";
-    public const string OpenRoads = "OpenRoads";
-    public const string OpenRail = "OpenRail";
-    public const string OpenBuildings = "OpenBuildings";
-    public const string ETABSv18 = "ETABSv18";
-    public const string ETABSv19 = "ETABSv19";
-    public const string TeklaStructures2021 = "TeklaStructures2021";
-    public const string TeklaStructures2020 = "TeklaStructures2020";
-    public const string Archicad = "Archicad";
-    public const string Script = "Script";
-    public const string Other = "Other";
-    public const string All = "All";
-  }
-
-  // <summary>
-  // List of Host Applications with their versions 
-  // Do not change these - they must match the converter names!
-  // </summary>
-  [Obsolete("Use HostApplications.XXX.GetVersion() instead", true)]
-  public static class VersionedHostApplications
-  {
-    public const string Rhino6 = "Rhino6";
-    public const string Rhino7 = "Rhino7";
-    public const string Grasshopper6 = "Grasshopper6";
-    public const string Grasshopper7 = "Grasshopper7";
-    public const string Revit2019 = "Revit2019";
-    public const string Revit2020 = "Revit2020";
-    public const string Revit2021 = "Revit2021";
-    public const string Revit2022 = "Revit2022";
-    public const string Revit2023 = "Revit2023";
-    public const string Dxf = "Dxf";
-    public const string DynamoSandbox = "DynamoSandbox";
-    public const string DynamoRevit = "DynamoRevit";
-    public const string DynamoRevit2021 = "DynamoRevit2021";
-    public const string DynamoRevit2022 = "DynamoRevit2022";
-    public const string DynamoRevit2023 = "DynamoRevit2023";
-    public const string Unity = "Unity";
-    public const string Excel = "Excel";
-    public const string GSA = "GSA";
-    public const string Civil2021 = "Civil2021";
-    public const string Civil2022 = "Civil2022";
-    public const string Civil2023 = "Civil2023";
-    public const string Autocad2021 = "AutoCAD2021";
-    public const string Autocad2022 = "AutoCAD2022";
-    public const string Autocad2023 = "AutoCAD2023";
-    public const string MicroStation = "MicroStation";
-    public const string OpenRoads = "OpenRoads";
-    public const string OpenRail = "OpenRail";
-    public const string OpenBuildings = "OpenBuildings";
-    public const string ETABS = "ETABS";
-    public const string SAP2000 = "SAP2000";
-    public const string CSIBridge = "CSIBridge";
-    public const string SAFE = "SAFE";
-    public const string CSI = "CSI";
-    public const string TeklaStructures2021 = "TeklaStructures2021";
-    public const string TeklaStructures2020 = "TeklaStructures2020";
-    public const string Script = "Script";
-    public const string Other = "Other";
-    public const string All = "All";
-  }
-
 }
diff --git a/Core/Core/Kits/KitManager.cs b/Core/Core/Kits/KitManager.cs
index a61004f962..88d988c211 100644
--- a/Core/Core/Kits/KitManager.cs
+++ b/Core/Core/Kits/KitManager.cs
@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -22,10 +23,10 @@ public static string KitsFolder
     {
       get
       {
-        if (_kitsFolder != null)
-          return _kitsFolder;
+        if (_kitsFolder == null)
+          _kitsFolder = Path.Combine(Helpers.InstallSpeckleFolderPath, "Kits");
 
-        return Path.Combine(Helpers.InstallSpeckleFolderPath, "Kits");
+        return _kitsFolder;
       }
       set
       {
@@ -147,9 +148,55 @@ private static void Load()
         .SelectMany(kit => kit.Value.Types).ToList();
     }
 
+    // recursive search for referenced assemblies
+    public static List<Assembly> GetReferencedAssemblies()
+    {
+      var returnAssemblies = new List<Assembly>();
+      var loadedAssemblies = new HashSet<string>();
+      var assembliesToCheck = new Queue<Assembly>();
+
+      assembliesToCheck.Enqueue(Assembly.GetEntryAssembly());
+
+      while (assembliesToCheck.Count > 0)
+      {
+        var assemblyToCheck = assembliesToCheck.Dequeue();
+
+        if (assemblyToCheck == null)
+          continue;
+
+        foreach (var reference in assemblyToCheck.GetReferencedAssemblies())
+        {
+          // filtering out system dlls
+          if (reference.FullName.StartsWith("System.") || reference.FullName.StartsWith("Microsoft."))
+            continue;
+
+          if (!loadedAssemblies.Contains(reference.FullName))
+          {
+            Assembly assembly = null;
+            try
+            {
+              assembly = Assembly.Load(reference);
+            }
+            catch
+            {
+              continue;
+            }
+            assembliesToCheck.Enqueue(assembly);
+            loadedAssemblies.Add(reference.FullName);
+            returnAssemblies.Add(assembly);
+          }
+        }
+      }
+
+      return returnAssemblies;
+    }
+
     private static void GetLoadedSpeckleReferencingAssemblies()
     {
-      foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+      List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
+      assemblies.AddRange(GetReferencedAssemblies());
+
+      foreach (var assembly in assemblies)
       {
         if (!assembly.IsDynamic && !assembly.ReflectionOnly)
         {
@@ -184,16 +231,22 @@ private static void LoadSpeckleReferencingAssemblies()
           if (unloadedAssemblyName == null)
             continue;
 
-          var assembly = Assembly.LoadFrom(assemblyPath);
-          var kitClass = GetKitClass(assembly);
-          if (assembly.IsReferencing(SpeckleAssemblyName) && kitClass != null)
+          try
           {
-            if (!_SpeckleKits.ContainsKey(assembly.FullName))
+            var assembly = Assembly.LoadFrom(assemblyPath);
+            var kitClass = GetKitClass(assembly);
+            if (assembly.IsReferencing(SpeckleAssemblyName) && kitClass != null)
             {
-              var speckleKit = Activator.CreateInstance(kitClass) as ISpeckleKit;
-              if (speckleKit != null) _SpeckleKits.Add(assembly.FullName, speckleKit);
+              if (!_SpeckleKits.ContainsKey(assembly.FullName))
+              {
+                var speckleKit = Activator.CreateInstance(kitClass) as ISpeckleKit;
+                if (speckleKit != null) _SpeckleKits.Add(assembly.FullName, speckleKit);
+              }
             }
           }
+          catch (FileLoadException ex)
+          {
+          }
         }
       }
     }
diff --git a/Core/Core/Logging/Analytics.cs b/Core/Core/Logging/Analytics.cs
index 5f4472427f..e307c03781 100644
--- a/Core/Core/Logging/Analytics.cs
+++ b/Core/Core/Logging/Analytics.cs
@@ -57,7 +57,11 @@ public enum Events
       /// <summary>
       /// Event triggered when the connector is registered
       /// </summary>
-      Registered
+      Registered,
+      /// <summary>
+      /// Event triggered by the Mapping Tool
+      /// </summary>
+      MappingsAction
     };
 
 
diff --git a/Core/Core/Models/DynamicBase.cs b/Core/Core/Models/DynamicBase.cs
index 0da6fd2c73..b684948405 100644
--- a/Core/Core/Models/DynamicBase.cs
+++ b/Core/Core/Models/DynamicBase.cs
@@ -94,7 +94,7 @@ public bool IsPropNameValid(string name, out string reason)
     /// </summary>
     /// <param name="key"></param>
     /// <returns></returns>
-    [IgnoreTheItemAttribute]
+    [IgnoreTheItem]
     public object this[string key]
     {
       get
@@ -153,6 +153,7 @@ private static void PopulatePropInfoCache(Type type)
     /// Gets all of the property names on this class, dynamic or not.
     /// </summary>
     /// <returns></returns>
+    [Obsolete("Use `GetMembers(DynamicBaseMemberType.All).Keys` instead")]
     public override IEnumerable<string> GetDynamicMemberNames()
     {
       PopulatePropInfoCache(GetType());
@@ -169,7 +170,9 @@ public override IEnumerable<string> GetDynamicMemberNames()
     /// Gets the names of the defined class properties (typed).
     /// </summary>
     /// <returns></returns>
+    [Obsolete("Use GetMembers(DynamicBaseMemberType.InstanceAll).Keys instead")]
     public IEnumerable<string> GetInstanceMembersNames() => GetInstanceMembersNames(GetType());
+    
     public static IEnumerable<string> GetInstanceMembersNames(Type t)
     {
       PopulatePropInfoCache(t);
@@ -246,6 +249,7 @@ public Dictionary<string, object> GetMembers(DynamicBaseMemberType includeMember
     /// Gets the dynamically added property names only.
     /// </summary>
     /// <returns></returns>
+    [Obsolete("Use GetMembers(DynamicBaseMemberType.Dynamic).Keys instead")]
     public IEnumerable<string> GetDynamicMembers()
     {
       return properties.Keys;
diff --git a/Core/Core/Models/DynamicBaseMemberType.cs b/Core/Core/Models/DynamicBaseMemberType.cs
index f5f50b0a25..0bbf618329 100644
--- a/Core/Core/Models/DynamicBaseMemberType.cs
+++ b/Core/Core/Models/DynamicBaseMemberType.cs
@@ -24,5 +24,13 @@ public enum DynamicBaseMemberType
     /// The typed members flagged with <see cref="SchemaIgnored"/> attribute.
     /// </summary>
     SchemaIgnored = 8,
+    /// <summary>
+    /// All the typed members, including ones with <see cref="ObsoleteAttribute"/> or <see cref="SchemaIgnored"/> attributes.
+    /// </summary>
+    InstanceAll = Instance + Obsolete + SchemaIgnored,
+    /// <summary>
+    /// All the members, including dynamic and instance members flagged with <see cref="ObsoleteAttribute"/> or <see cref="SchemaIgnored"/> attributes
+    /// </summary>
+    All = InstanceAll + Dynamic
   }
 }
diff --git a/Core/Examples/ExampleApp.csproj b/Core/Examples/ExampleApp.csproj
index 6703ec9dd4..a5e1ef4fcd 100644
--- a/Core/Examples/ExampleApp.csproj
+++ b/Core/Examples/ExampleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Core/IntegrationTests/Api.cs b/Core/IntegrationTests/Api.cs
index dfa69462a1..e58f61646d 100644
--- a/Core/IntegrationTests/Api.cs
+++ b/Core/IntegrationTests/Api.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Speckle.Core.Api;
+using Speckle.Core.Api;
 using Speckle.Core.Credentials;
 using Speckle.Core.Logging;
 using Speckle.Core.Models;
@@ -24,10 +21,10 @@ public class Api
     private string objectId = "";
 
     [OneTimeSetUp]
-    public void Setup()
+    public async Task Setup()
     {
-      firstUserAccount = Fixtures.SeedUser();
-      secondUserAccount = Fixtures.SeedUser();
+      firstUserAccount = await Fixtures.SeedUser();
+      secondUserAccount = await Fixtures.SeedUser();
 
       myClient = new Client(firstUserAccount);
       secondClient = new Client(secondUserAccount);
@@ -46,12 +43,27 @@ public async Task UserGet()
       Assert.NotNull(res);
     }
 
+    [Test]
+    public async Task ActiveUserGet()
+    {
+      var res = await myClient.ActiveUserGet();
+      Assert.That(myClient.Account.userInfo.id, Is.EqualTo(res.id));
+    }
+
+    [Test]
+    public async Task OtherUserGet()
+    {
+      var res = await myClient.OtherUserGet(secondUserAccount.userInfo.id);
+      Assert.That(secondUserAccount.userInfo.name, Is.EqualTo(res.name));
+
+    }
+
     [Test]
     public async Task UserSearch()
     {
       var res = await myClient.UserSearch(firstUserAccount.userInfo.email);
-
-      Assert.NotNull(res);
+      Assert.That(1, Is.EqualTo(res.Count));
+      Assert.That(firstUserAccount.userInfo.id, Is.EqualTo(res[0].id));
     }
 
     [Test]
@@ -117,14 +129,16 @@ public async Task StreamUpdate()
     }
 
     [Test, Order(30)]
-    public async Task StreamGrantPermission()
-    {
-      var exception = Assert.ThrowsAsync<SpeckleException>( async () => await myClient.StreamGrantPermission(
-        new StreamPermissionInput
-        {
-          streamId = streamId, userId = secondUserAccount.userInfo.id, role = "stream:owner"
-        }
-      ) );
+    public void StreamGrantPermission()
+    {
+      var exception = Assert.ThrowsAsync<SpeckleException>(
+        async () => await myClient.StreamGrantPermission(
+          new StreamPermissionInput
+          {
+            streamId = streamId, userId = secondUserAccount.userInfo.id, role = "stream:owner"
+          }
+        )
+      );
       
       StringAssert.Contains("no longer supported", exception.Message);
     }
@@ -286,7 +300,7 @@ public async Task ObjectGet()
       var res = await myClient.ObjectGet(streamId, objectId);
 
       Assert.NotNull(res);
-      Assert.AreEqual(100, res.totalChildrenCount);
+      Assert.That(100, Is.EqualTo(res.totalChildrenCount));
     }
 
     #endregion
diff --git a/Core/IntegrationTests/Fixtures.cs b/Core/IntegrationTests/Fixtures.cs
index 77d4696a9c..e96e4354e7 100644
--- a/Core/IntegrationTests/Fixtures.cs
+++ b/Core/IntegrationTests/Fixtures.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Net;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Speckle.Core.Api;
 using Speckle.Core.Credentials;
+using System.Text;
+using System.Net.Mime;
 
 namespace TestsIntegration
 {
@@ -13,7 +10,7 @@ public static class Fixtures
   {
     public static readonly ServerInfo Server = new ServerInfo { url = "http://localhost:3000", name = "Docker Server" };
 
-    public static Account SeedUser()
+    public static async Task<Account> SeedUser()
     {
       var seed = Guid.NewGuid().ToString().ToLower();
       var user = new Dictionary<string, string>();
@@ -21,45 +18,27 @@ public static Account SeedUser()
       user["password"] = "12ABC3456789DEF0GHO";
       user["name"] = $"{seed.Substring(0, 5)} Name";
 
-      var registerRequest = (HttpWebRequest)WebRequest.Create($"{Server.url}/auth/local/register?challenge=challengingchallenge");
-      registerRequest.Method = "POST";
-      registerRequest.ContentType = "application/json";
-      registerRequest.AllowAutoRedirect = false;
-
-
-      using (var streamWriter = new StreamWriter(registerRequest.GetRequestStream()))
+      var httpClient = new HttpClient(new HttpClientHandler()
       {
-        string json = JsonConvert.SerializeObject(user);
-        streamWriter.Write(json);
-        streamWriter.Flush();
-      }
+        AllowAutoRedirect = false
+      });
+      httpClient.BaseAddress = new Uri(Server.url);
 
-      WebResponse response;
-      string redirectUrl = null;
+      string redirectUrl;
       try
       {
-        response = registerRequest.GetResponse();
-        redirectUrl = response.Headers[HttpResponseHeader.Location];
-        Debug.WriteLine(redirectUrl);
+        var response = await httpClient.PostAsync(
+          "/auth/local/register?challenge=challengingchallenge",
+          // $"{Server.url}/auth/local/register?challenge=challengingchallenge",
+          new StringContent(JsonConvert.SerializeObject(user), Encoding.UTF8, MediaTypeNames.Application.Json)
+        );
+        redirectUrl = response.Headers.Location.AbsoluteUri;
       }
-      catch (WebException e)
+      catch (Exception e)
       {
-        if (e.Message.Contains("302"))
-        {
-          Console.WriteLine("We are redirected!");
-          response = e.Response;
-          redirectUrl = e.Response.Headers[HttpResponseHeader.Location];
-          Console.WriteLine("We are redirected; but in an error.");
-          Console.WriteLine(redirectUrl);
-        }
+        throw new Exception($"Cannot seed user on the server {Server.url}", e);
       }
 
-      var tokenRequest = (HttpWebRequest)WebRequest.Create($"{Server.url}/auth/token");
-      tokenRequest.Method = "POST";
-      tokenRequest.ContentType = "application/json";
-
-      Console.WriteLine(redirectUrl);
-      Console.WriteLine("Why do the tests pass locally?");
       var accessCode = redirectUrl.Split("?access_code=")[1];
       var tokenBody = new Dictionary<string, string>()
       {
@@ -69,25 +48,22 @@ public static Account SeedUser()
         ["challenge"] = "challengingchallenge"
       };
 
-      using (var streamWriter = new StreamWriter(tokenRequest.GetRequestStream()))
-      {
-        string json = JsonConvert.SerializeObject(tokenBody);
-        streamWriter.Write(json);
-        streamWriter.Flush();
-      }
-
-      var tokenResponse = tokenRequest.GetResponse();
-      var deserialised = new Dictionary<string, string>();
-      using (var streamReader = new StreamReader(tokenResponse.GetResponseStream()))
-      {
-        var text = streamReader.ReadToEnd();
-        deserialised = JsonConvert.DeserializeObject<Dictionary<string, string>>(text);
-      }
+      var tokenResponse = await httpClient.PostAsync(
+        "/auth/token",
+        new StringContent(JsonConvert.SerializeObject(tokenBody), Encoding.UTF8, MediaTypeNames.Application.Json)
+      );
+      var deserialised = JsonConvert.DeserializeObject<Dictionary<string, string>>(
+        await tokenResponse.Content.ReadAsStringAsync()
+      );
 
-      var acc = new Account { token = deserialised["token"], userInfo = new UserInfo { id = user["name"], email = user["email"] }, serverInfo = Server };
+      var acc = new Account { 
+        token = deserialised["token"], 
+        userInfo = new UserInfo { id = user["name"], email = user["email"], name = user["name"] }, 
+        serverInfo = Server 
+      };
       var client = new Client(acc);
 
-      var user1 = client.UserGet().Result;
+      var user1 = await client.ActiveUserGet();
       acc.userInfo.id = user1.id;
 
       return acc;
diff --git a/Core/IntegrationTests/Subscriptions/Branches.cs b/Core/IntegrationTests/Subscriptions/Branches.cs
index d3a00b30fb..3af546cfbc 100644
--- a/Core/IntegrationTests/Subscriptions/Branches.cs
+++ b/Core/IntegrationTests/Subscriptions/Branches.cs
@@ -20,9 +20,9 @@ public class Branches
     string streamId;
 
     [OneTimeSetUp]
-    public void Setup()
+    public async Task Setup()
     {
-      testUserAccount = Fixtures.SeedUser();
+      testUserAccount = await Fixtures.SeedUser();
       client = new Client(testUserAccount);
     }
 
diff --git a/Core/IntegrationTests/Subscriptions/Commits.cs b/Core/IntegrationTests/Subscriptions/Commits.cs
index 0d7c83a63c..0199216efd 100644
--- a/Core/IntegrationTests/Subscriptions/Commits.cs
+++ b/Core/IntegrationTests/Subscriptions/Commits.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
+using System.Diagnostics;
 using Speckle.Core.Api;
 using Speckle.Core.Api.SubscriptionModels;
 using Speckle.Core.Credentials;
@@ -26,9 +21,9 @@ public class Commits
     string streamId;
 
     [OneTimeSetUp]
-    public void Setup()
+    public async Task Setup()
     {
-      testUserAccount = Fixtures.SeedUser();
+      testUserAccount = await Fixtures.SeedUser();
       client = new Client(testUserAccount);
       myServerTransport = new ServerTransport(testUserAccount, null);
       myServerTransport.Api.CompressPayloads = false;
diff --git a/Core/IntegrationTests/Subscriptions/Streams.cs b/Core/IntegrationTests/Subscriptions/Streams.cs
index 824e488751..9c52466164 100644
--- a/Core/IntegrationTests/Subscriptions/Streams.cs
+++ b/Core/IntegrationTests/Subscriptions/Streams.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Speckle.Core.Api;
+using Speckle.Core.Api;
 using Speckle.Core.Api.SubscriptionModels;
 using Speckle.Core.Credentials;
 
@@ -19,9 +15,9 @@ public class Streams
     string streamId;
 
     [OneTimeSetUp]
-    public void Setup()
+    public async Task Setup()
     {
-      testUserAccount = Fixtures.SeedUser();
+      testUserAccount = await Fixtures.SeedUser();
       client = new Client(testUserAccount);
     }
 
diff --git a/Core/IntegrationTests/TestsIntegration.csproj b/Core/IntegrationTests/TestsIntegration.csproj
index 72ec9ee9a4..3b73b2ae41 100644
--- a/Core/IntegrationTests/TestsIntegration.csproj
+++ b/Core/IntegrationTests/TestsIntegration.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -9,14 +11,15 @@
     <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.1.1">
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="JunitXml.TestLogger" Version="3.0.110" />
-    <PackageReference Include="nunit" Version="3.13.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
     <PackageReference Include="System.Text.Json" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/Core/IntegrationTests/Usings.cs b/Core/IntegrationTests/Usings.cs
new file mode 100644
index 0000000000..cefced4969
--- /dev/null
+++ b/Core/IntegrationTests/Usings.cs
@@ -0,0 +1 @@
+global using NUnit.Framework;
\ No newline at end of file
diff --git a/Core/Tests/BaseTests.cs b/Core/Tests/BaseTests.cs
index fc29b8a522..326a663e00 100755
--- a/Core/Tests/BaseTests.cs
+++ b/Core/Tests/BaseTests.cs
@@ -166,6 +166,65 @@ public void CanGetMembers_OnlyInstance_IncludeObsolete()
       Assert.That(names, Has.Member(nameof(@base.attachedProp)));
     }
     
+    [Test]
+    public void CanGetMembers_IsEquivalentTo_GetMemberNames()
+    {
+      var @base = new SampleObject();
+      var dynamicProp = "dynamicProp";
+      @base[dynamicProp] = null;
+      
+      var expected = @base.GetMemberNames();
+      var actual = @base
+        .GetMembers()
+        .Keys;
+      
+      Assert.That(actual, Is.EquivalentTo(expected));
+    }
+    
+    [Test]
+    public void CanGetMembers_IsEquivalentTo_GetDynamicMemberNames()
+    {
+      var @base = new SampleObject();
+      var dynamicProp = "dynamicProp";
+      @base[dynamicProp] = null;
+      
+      var expected = @base.GetDynamicMemberNames();
+      var actual = @base
+        .GetMembers(DynamicBaseMemberType.All)
+        .Keys;
+      
+      Assert.That(actual, Is.EquivalentTo(expected));
+    }
+
+    [Test]
+    public void CanGetMembers_IsEquivalentTo_GetInstanceMembersNames()
+    {
+      var @base = new SampleObject();
+      var dynamicProp = "dynamicProp";
+      @base[dynamicProp] = null;
+      
+      var expected = @base.GetInstanceMembersNames();
+      var actual = @base
+        .GetMembers(DynamicBaseMemberType.InstanceAll)
+        .Keys;
+      
+      Assert.That(actual, Is.EquivalentTo(expected));
+    }
+    
+    [Test]
+    public void CanGetMembers_IsEquivalentTo_GetDynamicMembers()
+    {
+      var @base = new SampleObject();
+      var dynamicProp = "dynamicProp";
+      @base[dynamicProp] = null;
+      
+      var expected = @base.GetDynamicMembers();
+      var actual = @base
+        .GetMembers(DynamicBaseMemberType.Dynamic)
+        .Keys;
+      
+      Assert.That(actual, Is.EquivalentTo(expected));
+    }
     
     [Test]
     public void CanGetDynamicMembers()
diff --git a/Core/Tests/TestsUnit.csproj b/Core/Tests/TestsUnit.csproj
index 0fae1da343..8e58b31617 100644
--- a/Core/Tests/TestsUnit.csproj
+++ b/Core/Tests/TestsUnit.csproj
@@ -1,21 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsTestProject>true</IsTestProject>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.1.1">
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="JunitXml.TestLogger" Version="3.0.110" />
-    <PackageReference Include="nunit" Version="3.13.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
     <PackageReference Include="System.Text.Json" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
diff --git a/DesktopUI/DesktopUI/Streams/Dialogs/ShareStreamDialogViewModel.cs b/DesktopUI/DesktopUI/Streams/Dialogs/ShareStreamDialogViewModel.cs
index 88374385dc..d138825ddd 100644
--- a/DesktopUI/DesktopUI/Streams/Dialogs/ShareStreamDialogViewModel.cs
+++ b/DesktopUI/DesktopUI/Streams/Dialogs/ShareStreamDialogViewModel.cs
@@ -57,9 +57,9 @@ public string UserQuery
       }
     }
 
-    private BindableCollection<User> _userSearchResults;
+    private BindableCollection<LimitedUser> _userSearchResults;
 
-    public BindableCollection<User> UserSearchResults
+    public BindableCollection<LimitedUser> UserSearchResults
     {
       get => _userSearchResults;
       set => SetAndNotify(ref _userSearchResults, value);
@@ -113,7 +113,7 @@ public async void SearchForUsers()
       {
         var users = await StreamState.Client.UserSearch(UserQuery);
         DropdownState = true; // open search dropdown when there are results
-        UserSearchResults = new BindableCollection<User>(users);
+        UserSearchResults = new BindableCollection<LimitedUser>(users);
       }
       catch (Exception e)
       {
diff --git a/DesktopUI/DesktopUI/Utils/Converters.cs b/DesktopUI/DesktopUI/Utils/Converters.cs
index 6316b24107..c57faf10e8 100644
--- a/DesktopUI/DesktopUI/Utils/Converters.cs
+++ b/DesktopUI/DesktopUI/Utils/Converters.cs
@@ -104,7 +104,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
     {
       var imgString = "";
 
-      switch ( value )
+      switch (value)
       {
         case null:
           return null;
@@ -116,12 +116,12 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
           break;
         case Account account:
           var client = new Client(account);
-          User userRes = new User();
+          LimitedUser userRes = new LimitedUser();
           try
           {
-            userRes = Task.Run(async () => ( await client.UserSearch(account.userInfo.email) ).FirstOrDefault()).Result;
+            userRes = Task.Run(async () => (await client.UserSearch(account.userInfo.email)).FirstOrDefault()).Result;
           }
-          catch ( Exception )
+          catch (Exception)
           {
             // server is offline
           }
@@ -131,13 +131,13 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
           throw new InvalidOperationException("Unrecognised type given to robot converter");
       }
 
-      if ( imgString.StartsWith("http") ) return imgString;
+      if (imgString.StartsWith("http")) return imgString;
       return StringToBitmap(imgString);
     }
 
     private BitmapImage StringToBitmap(string value)
     {
-      if ( !value.StartsWith("data:image/") ) return null;
+      if (!value.StartsWith("data:image/")) return null;
       var str = value.Split(',')[1];
       var img = new BitmapImage();
       img.BeginInit();
diff --git a/DesktopUI/DesktopUI/Utils/StreamDialogBase.cs b/DesktopUI/DesktopUI/Utils/StreamDialogBase.cs
index 1d4d510df1..c3f61db887 100644
--- a/DesktopUI/DesktopUI/Utils/StreamDialogBase.cs
+++ b/DesktopUI/DesktopUI/Utils/StreamDialogBase.cs
@@ -65,7 +65,8 @@ public BindableCollection<FilterTab> FilterTabs
     public FilterTab SelectedFilterTab
     {
       get => _selectedFilterTab;
-      set {
+      set
+      {
         SetAndNotify(ref _selectedFilterTab, value);
         _selectedFilterTab.RestoreSelectedItems();
       }
@@ -94,9 +95,9 @@ public string UserQuery
       }
     }
 
-    private BindableCollection<User> _userSearchResults;
+    private BindableCollection<LimitedUser> _userSearchResults;
 
-    public BindableCollection<User> UserSearchResults
+    public BindableCollection<LimitedUser> UserSearchResults
     {
       get => _userSearchResults;
       set => SetAndNotify(ref _userSearchResults, value);
@@ -126,7 +127,7 @@ public async void SearchForUsers()
       {
         var client = new Client(AccountToSendFrom);
         var users = await client.UserSearch(UserQuery);
-        UserSearchResults = new BindableCollection<User>(users);
+        UserSearchResults = new BindableCollection<LimitedUser>(users);
       }
       catch (Exception e)
       {
diff --git a/DesktopUI2/DesktopUI2.Launcher/Program.cs b/DesktopUI2/DesktopUI2.Launcher/Program.cs
index 03e4a8172b..1a0c649b62 100644
--- a/DesktopUI2/DesktopUI2.Launcher/Program.cs
+++ b/DesktopUI2/DesktopUI2.Launcher/Program.cs
@@ -1,6 +1,8 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
+using System.Diagnostics;
 using System.IO;
+using System.Threading;
 
 namespace DesktopUI2.Launcher
 {
@@ -17,8 +19,9 @@ public static AppBuilder BuildAvaloniaApp()
     {
 
       // to debug the VS previewer
-      // 1. open another instanc of the project in VS
-      // 2. uncomment the lines below
+      // 
+      // 1. uncomment the lines below & rebuild
+      // 2. (optional)open another instance of the project in VS & attach it to this process
       // 3. close and reopen the problematic XAML window
 
       //Debugger.Launch();
diff --git a/DesktopUI2/DesktopUI2.sln b/DesktopUI2/DesktopUI2.sln
index 6ffe7d8571..3fb62434b4 100644
--- a/DesktopUI2/DesktopUI2.sln
+++ b/DesktopUI2/DesktopUI2.sln
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2.WPF", "DesktopUI
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaHwndHost", "AvaloniaHwndHost\AvaloniaHwndHost.csproj", "{421B0919-F7DB-4283-A5A2-009267428776}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Objects", "..\Objects\Objects\Objects.csproj", "{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +63,14 @@ Global
 		{421B0919-F7DB-4283-A5A2-009267428776}.Release|Any CPU.Build.0 = Release|Any CPU
 		{421B0919-F7DB-4283-A5A2-009267428776}.Release|x86.ActiveCfg = Release|Any CPU
 		{421B0919-F7DB-4283-A5A2-009267428776}.Release|x86.Build.0 = Release|Any CPU
+		{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}.Debug|x86.Build.0 = Debug|Any CPU
+		{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CA85D2B-2B7E-40DB-B821-D215F46EAA9B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/DesktopUI2/DesktopUI2/App.xaml b/DesktopUI2/DesktopUI2/App.xaml
index 15c5ad0754..e19beb4948 100644
--- a/DesktopUI2/DesktopUI2/App.xaml
+++ b/DesktopUI2/DesktopUI2/App.xaml
@@ -3,7 +3,6 @@
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:local="using:DesktopUI2"
-  xmlns:style="clr-namespace:DesktopUI2.Styles"
   xmlns:themes="clr-namespace:Material.Styles.Themes;assembly=Material.Styles">
   <Application.DataTemplates>
     <local:ViewLocator />
diff --git a/DesktopUI2/DesktopUI2/App.xaml.cs b/DesktopUI2/DesktopUI2/App.xaml.cs
index 0db1645a94..e599a2faef 100644
--- a/DesktopUI2/DesktopUI2/App.xaml.cs
+++ b/DesktopUI2/DesktopUI2/App.xaml.cs
@@ -3,8 +3,10 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using DesktopUI2.ViewModels;
+using DesktopUI2.ViewModels.MappingTool;
 using DesktopUI2.Views;
 using Material.Styles.Themes;
+using Speckle.Core.Kits;
 
 namespace DesktopUI2
 {
@@ -18,8 +20,21 @@ public class App : Application
 
     public override void Initialize()
     {
+      //NOTE: the Mapping Tool is referencing Objects but we're not copying its dll from release and local builds
+      //this is because it could lead to versions incompatibilities
+      //the KitManager is invoked here to load Objects in the current AppDomain for us
+      try
+      {
+        var objects = KitManager.GetDefaultKit();
+      }
+      catch
+      {
+
+      }
+
+
       AvaloniaXamlLoader.Load(this);
-      this.Name = "Speckle";
+      Name = "Speckle";
     }
 
     public override void OnFrameworkInitializationCompleted()
@@ -31,6 +46,11 @@ public override void OnFrameworkInitializationCompleted()
 
       if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
       {
+        //desktop.MainWindow = new MappingsWindow
+        //{
+        //  DataContext = new MappingsViewModel(),
+        //};
+
         desktop.MainWindow = new MainWindow
         {
           DataContext = new MainViewModel(),
diff --git a/DesktopUI2/DesktopUI2/Assets/instructions.gif b/DesktopUI2/DesktopUI2/Assets/instructions.gif
new file mode 100644
index 0000000000..c7bbf3cc61
Binary files /dev/null and b/DesktopUI2/DesktopUI2/Assets/instructions.gif differ
diff --git a/DesktopUI2/DesktopUI2/Assets/mapping.png b/DesktopUI2/DesktopUI2/Assets/mapping.png
new file mode 100644
index 0000000000..6079dc87c2
Binary files /dev/null and b/DesktopUI2/DesktopUI2/Assets/mapping.png differ
diff --git a/DesktopUI2/DesktopUI2/ConnectorBindings.cs b/DesktopUI2/DesktopUI2/ConnectorBindings.cs
index ee580454d5..d4e1757394 100644
--- a/DesktopUI2/DesktopUI2/ConnectorBindings.cs
+++ b/DesktopUI2/DesktopUI2/ConnectorBindings.cs
@@ -3,6 +3,7 @@
 using DesktopUI2.Models.Settings;
 using DesktopUI2.ViewModels;
 using Sentry.Reflection;
+using Speckle.Core.Api;
 using Speckle.Core.Kits;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -34,33 +35,46 @@ public ConnectorBindings() { }
 
     #endregion
 
-    public virtual bool CanSelectObjects()
-    {
-      return false;
-    }
-
-    public virtual bool CanTogglePreview()
-    {
-      return false;
-    }
+    #region virtual methods & properties
+    public virtual bool CanSelectObjects => false;
 
-    #region abstract properties
+    public virtual bool CanTogglePreview => false;
 
     /// <summary>
     /// Indicates if previewing send has been implemented
     /// </summary>
     /// <returns></returns>
-    public abstract bool CanPreviewSend { get; }
+    public virtual bool CanPreviewSend => false;
 
     /// <summary>
     /// Indicates if previewing receive has been implemented
     /// </summary>
     /// <returns></returns>
-    public abstract bool CanPreviewReceive { get; }
+    public virtual bool CanPreviewReceive => false;
+
+
+    /// <summary>
+    /// Returns true if the <see cref="Open3DView"/> method is overwritten and implemented. 
+    /// </summary>
+    /// <returns></returns>
+    public virtual bool CanOpen3DView => false;
+
+
+    /// <summary>
+    /// Opens a 3D view in the host application
+    /// </summary>
+    /// <param name="viewCoordinates">First three values are the camera position, second three the target. TODO: update to use <see cref="Base"/></param>
+    /// <param name="viewName">Id or Name of the view</param>
+    /// <returns></returns>
+    public virtual Task Open3DView(List<double> viewCoordinates, string viewName = "")
+    {
+      return Task.CompletedTask;
+    }
 
     #endregion
 
 
+
     #region abstract methods
 
     /// <summary>
@@ -206,7 +220,7 @@ public virtual bool CanTogglePreview()
     /// Imports family symbols in Revit 
     /// </summary>
     /// <returns></returns>
-    public abstract Task<Dictionary<string, List<MappingValue>>> ImportFamilyCommand(Dictionary<string,List<MappingValue>> Mapping);
+    public abstract Task<Dictionary<string, List<MappingValue>>> ImportFamilyCommand(Dictionary<string, List<MappingValue>> Mapping);
     #endregion
   }
 }
diff --git a/DesktopUI2/DesktopUI2/DesktopUI2.csproj b/DesktopUI2/DesktopUI2/DesktopUI2.csproj
index 41416b3a73..cf6c1e5e03 100644
--- a/DesktopUI2/DesktopUI2/DesktopUI2.csproj
+++ b/DesktopUI2/DesktopUI2/DesktopUI2.csproj
@@ -30,9 +30,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Remove="App.xaml" />
+    <None Remove="Styles\NotificationCard.xaml" />
+    <None Remove="Styles\NotificationManager.xaml" />
+    <None Remove="Views\Controls\CollaboratorsControl.xaml" />
     <None Remove="Views\Controls\PreviewButton.xaml" />
-    <None Remove="Views\Controls\ReceiveButton.xaml" />
-    <None Remove="Views\Controls\SendButton.xaml" />
     <None Remove="Styles\Button.xaml" />
     <None Remove="Styles\ChipListBox.xaml" />
     <None Remove="Styles\ComboBox.xaml" />
@@ -45,25 +46,26 @@
     <None Remove="Styles\Styles.xaml" />
     <None Remove="Styles\Text.xaml" />
     <None Remove="Styles\TextBox.xaml" />
+    <None Remove="Views\Controls\StreamSelector.xaml" />
     <None Remove="Views\Filters\AllFilterView.xaml" />
     <None Remove="Views\Filters\ListFilterView.xaml" />
     <None Remove="Views\Filters\ManualFilterView.xaml" />
     <None Remove="Views\Filters\PropertyFilterView.xaml" />
     <None Remove="Views\MainUserControl.xaml" />
     <None Remove="Views\MainWindow.xaml" />
-    <None Remove="Views\Pages\HomeControls\SavedStreams.xaml" />
+    <None Remove="Views\MappingsControl.xaml" />
+    <None Remove="Views\MappingsWindow.xaml" />
+    <None Remove="Views\Mappings\Controls\RevitBasic.xaml" />
     <None Remove="Views\Pages\HomeView.xaml" />
-    <None Remove="Views\Pages\ShareControls\ChangeRoleDialog.xaml" />
-    <None Remove="Views\Pages\SharedControls\StreamDetails.xaml" />
-    <None Remove="Views\Pages\StreamEditControls\Activity.xaml" />
-    <None Remove="Views\Pages\StreamEditControls\Comments.xaml" />
-    <None Remove="Views\Pages\StreamEditControls\Report.xaml" />
+    <None Remove="Views\Pages\LogInView.xaml" />
+    <None Remove="Views\Pages\NotificationsView.xaml" />
+    <None Remove="Views\Pages\OneClickView.xaml" />
+    <None Remove="Views\Controls\StreamEditControls\Activity.xaml" />
+    <None Remove="Views\Controls\StreamEditControls\Comments.xaml" />
+    <None Remove="Views\Controls\StreamEditControls\Report.xaml" />
     <None Remove="Views\Pages\SettingsView.xaml" />
-    <None Remove="Views\Pages\ShareControls\AddCollaborators.xaml" />
-    <None Remove="Views\Pages\ShareControls\CollaboratorsView.xaml" />
-    <None Remove="Views\Pages\ShareControls\Sending.xaml" />
-    <None Remove="Views\Pages\StreamEditControls\Receive.xaml" />
-    <None Remove="Views\Pages\StreamEditControls\Send.xaml" />
+    <None Remove="Views\Controls\StreamEditControls\Receive.xaml" />
+    <None Remove="Views\Controls\StreamEditControls\Send.xaml" />
     <None Remove="Views\Pages\StreamEditView.xaml" />
     <None Remove="Views\Scheduler.xaml" />
     <None Remove="Views\Settings\CheckBoxSettingView.xaml" />
@@ -120,16 +122,22 @@
     <AvaloniaXaml Include="App.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Controls\PreviewButton.xaml">
+    <AvaloniaXaml Include="Styles\NotificationCard.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaXaml>
+    <AvaloniaXaml Include="Styles\NotificationManager.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Controls\ReceiveButton.xaml">
+    <AvaloniaXaml Include="Views\Controls\CollaboratorsControl.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Controls\SendButton.xaml">
+    <AvaloniaXaml Include="Views\Controls\PreviewButton.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
     <AvaloniaXaml Include="Styles\MenuItem.xaml" />
+    <AvaloniaXaml Include="Views\Controls\StreamSelector.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaXaml>
     <AvaloniaXaml Include="Views\Filters\AllFilterView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
@@ -145,31 +153,43 @@
     <AvaloniaXaml Include="Views\MainUserControl.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\ShareControls\ChangeRoleDialog.xaml">
+    <AvaloniaXaml Include="Views\MappingsControl.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\SharedControls\StreamDetails.xaml">
+    <AvaloniaXaml Include="Views\MappingsWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\StreamEditControls\Activity.xaml">
+    <AvaloniaXaml Include="Views\Mappings\Controls\RevitBasic.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\StreamEditControls\Comments.xaml">
-        <Generator>MSBuild:Compile</Generator>
+    <AvaloniaXaml Include="Views\Pages\LogInView.xaml">
+      <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\SettingsView.xaml">
+    <AvaloniaXaml Include="Views\Pages\NotificationsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaXaml>
+    <AvaloniaXaml Include="Views\Pages\OneClickView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaXaml>
+    <AvaloniaXaml Include="Views\Windows\Dialogs\ChangeRoleDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaXaml>
+    <AvaloniaXaml Include="Views\Controls\StreamDetails.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\ShareControls\AddCollaborators.xaml">
+    <AvaloniaXaml Include="Views\Controls\StreamEditControls\Activity.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\ShareControls\CollaboratorsView.xaml">
+    <AvaloniaXaml Include="Views\Controls\StreamEditControls\Comments.xaml">
+        <Generator>MSBuild:Compile</Generator>
+    </AvaloniaXaml>
+    <AvaloniaXaml Include="Views\Pages\SettingsView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\ShareControls\Sending.xaml">
+    <AvaloniaXaml Include="Views\Pages\CollaboratorsView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\StreamEditControls\Report.xaml">
+    <AvaloniaXaml Include="Views\Controls\StreamEditControls\Report.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
     <AvaloniaXaml Include="Views\Pages\StreamEditView.xaml">
@@ -181,16 +201,16 @@
     <AvaloniaXaml Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\HomeControls\SavedStreams.xaml">
+    <AvaloniaXaml Include="Views\Controls\SavedStreams.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
     <AvaloniaXaml Include="Views\Pages\HomeView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\StreamEditControls\Receive.xaml">
+    <AvaloniaXaml Include="Views\Controls\StreamEditControls\Receive.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\StreamEditControls\Send.xaml">
+    <AvaloniaXaml Include="Views\Controls\StreamEditControls\Send.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
     <AvaloniaXaml Include="Views\Settings\CheckBoxSettingView.xaml">
@@ -202,9 +222,6 @@
 	  <AvaloniaXaml Include="Views\Settings\MultiSelectBoxSettingView.xaml">
 		  <Generator>MSBuild:Compile</Generator>
 	  </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Share.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
     <AvaloniaXaml Include="Views\Windows\Dialogs\AddAccountDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaXaml>
@@ -257,14 +274,14 @@
     <Compile Update="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
+    <Compile Update="Views\Controls\CollaboratorsControl.xaml.cs">
+      <DependentUpon>CollaboratorsControl.xaml</DependentUpon>
+    </Compile>
     <Compile Update="Views\Controls\PreviewButton.xaml.cs">
       <DependentUpon>PreviewButton.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Controls\ReceiveButton.xaml.cs">
-      <DependentUpon>ReceiveButton.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Controls\SendButton.xaml.cs">
-      <DependentUpon>SendButton.xaml</DependentUpon>
+    <Compile Update="Views\Controls\StreamSelector.xaml.cs">
+      <DependentUpon>StreamSelector.xaml</DependentUpon>
     </Compile>
     <Compile Update="Views\Filters\AllFilterView.xaml.cs">
       <DependentUpon>AllFilterView.xaml</DependentUpon>
@@ -278,16 +295,34 @@
     <Compile Update="Views\Filters\PropertyFilterView.xaml.cs">
       <DependentUpon>PropertyFilterView.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Pages\ShareControls\ChangeRoleDialog.xaml.cs">
+    <Compile Update="Views\MappingsControl.xaml.cs">
+      <DependentUpon>MappingsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Views\MappingsWindow.xaml.cs">
+      <DependentUpon>MappingsWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Views\Mappings\Controls\RevitBasic.xaml.cs">
+      <DependentUpon>RevitBasic.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Views\Pages\LogInView.xaml.cs">
+      <DependentUpon>LogInView.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Views\Pages\NotificationsView.xaml.cs">
+      <DependentUpon>NotificationsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Views\Pages\OneClickView.xaml.cs">
+      <DependentUpon>OneClickView.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Views\Windows\Dialogs\ChangeRoleDialog.xaml.cs">
       <DependentUpon>ChangeRoleDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Pages\SharedControls\StreamDetails.xaml.cs">
+    <Compile Update="Views\Controls\StreamDetails.xaml.cs">
       <DependentUpon>StreamDetails.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Pages\StreamEditControls\Activity.xaml.cs">
+    <Compile Update="Views\Controls\StreamEditControls\Activity.xaml.cs">
       <DependentUpon>Activity.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Pages\StreamEditControls\Comments.xaml.cs">
+    <Compile Update="Views\Controls\StreamEditControls\Comments.xaml.cs">
       <DependentUpon>Comments.xaml</DependentUpon>
     </Compile>
     <Compile Update="Views\Pages\StreamEditView.xaml.cs">
@@ -299,16 +334,16 @@
     <Compile Update="Views\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Pages\HomeControls\SavedStreams.xaml.cs">
+    <Compile Update="Views\Controls\SavedStreams.xaml.cs">
       <DependentUpon>SavedStreams.xaml</DependentUpon>
     </Compile>
     <Compile Update="Views\Pages\HomeView.xaml.cs">
       <DependentUpon>HomeView.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Pages\StreamEditControls\Receive.xaml.cs">
+    <Compile Update="Views\Controls\StreamEditControls\Receive.xaml.cs">
       <DependentUpon>Receive.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Pages\StreamEditControls\Send.xaml.cs">
+    <Compile Update="Views\Controls\StreamEditControls\Send.xaml.cs">
       <DependentUpon>Send.xaml</DependentUpon>
     </Compile>
     <Compile Update="Views\Settings\ListBoxSettingView.xaml.cs">
@@ -350,5 +385,14 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Core\Core.csproj" />
+    <ProjectReference Include="..\..\Objects\Objects\Objects.csproj">
+			<!--Prevent copying Objects.dll only Private seems to work, but let's keep all of them-->
+      <CopyLocal>False</CopyLocal>
+			<Private>False</Private>
+      <CopyLocalSatelliteAssemblies>False</CopyLocalSatelliteAssemblies>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
+			<PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/DesktopUI2/DesktopUI2/DummyBindings.cs b/DesktopUI2/DesktopUI2/DummyBindings.cs
index f49dc6b4ed..80040b970f 100644
--- a/DesktopUI2/DesktopUI2/DummyBindings.cs
+++ b/DesktopUI2/DesktopUI2/DummyBindings.cs
@@ -438,7 +438,7 @@ public override async Task<string> SendStream(StreamState state, ProgressViewMod
 
         var r = new Random(i);
         var status = (ApplicationObject.State)r.Next(5);
-        var appObj = new ApplicationObject(i.ToString(), "Some Object") { Status = status, Log = new List<string>() { "Some description"} };
+        var appObj = new ApplicationObject(i.ToString(), "Some Object") { Status = status, Log = new List<string>() { "Some description" } };
         progress.Report.Log(appObj);
 
         await Task.Delay(TimeSpan.FromMilliseconds(rnd.Next(200, 1000)));
@@ -480,5 +480,10 @@ public override async Task<Dictionary<string, List<MappingValue>>> ImportFamilyC
       await Task.Delay(TimeSpan.FromMilliseconds(rnd.Next(200, 1000)));
       return new Dictionary<string, List<MappingValue>>();
     }
+
+    public override Task Open3DView(List<double> viewCoordinates, string viewName = "")
+    {
+      throw new NotImplementedException();
+    }
   }
 }
diff --git a/DesktopUI2/DesktopUI2/DummyMappingsBindings.cs b/DesktopUI2/DesktopUI2/DummyMappingsBindings.cs
new file mode 100644
index 0000000000..05ad12d646
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/DummyMappingsBindings.cs
@@ -0,0 +1,53 @@
+using DesktopUI2.ViewModels.MappingTool;
+using Objects.Geometry;
+using Speckle.Core.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace DesktopUI2
+{
+  public class DummyMappingsBindings : MappingsBindings
+  {
+    public override void SetMappings(string schema, string viewModel)
+    {
+
+    }
+
+    public override MappingSelectionInfo GetSelectionInfo()
+    {
+      var type = typeof(Schema);
+      var schemas = Assembly.GetExecutingAssembly().GetTypes().Where(p => type.IsAssignableFrom(p) && type != p).Select(x => (Schema)Activator.CreateInstance(x)).ToList();
+
+      return new MappingSelectionInfo(schemas, 13);
+
+    }
+
+    public override List<Schema> GetExistingSchemaElements()
+    {
+      return new List<Schema> {
+        new RevitWallViewModel { SelectedFamily = new RevitFamily { Name = "Yolo Family" }, SelectedType = "Simplex Ultra 500x500" },
+        new RevitWallViewModel{ SelectedFamily = new RevitFamily { Name = "Basic Wall" }, SelectedType = "Partitioning Extra Fine 2mm" },
+        new DirectShapeFreeformViewModel{ ShapeName="Curvy BREP", SelectedCategory = "GenericModels" } };
+    }
+
+    public override void HighlightElements(List<string> ids)
+    {
+    }
+
+    public override void SelectElements(List<string> ids)
+    {
+    }
+
+    public override void ClearMappings()
+    {
+    }
+
+    public DummyMappingsBindings()
+    {
+
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/MappingsBindings.cs b/DesktopUI2/DesktopUI2/MappingsBindings.cs
new file mode 100644
index 0000000000..ba9aeb9946
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/MappingsBindings.cs
@@ -0,0 +1,78 @@
+using DesktopUI2.ViewModels.MappingTool;
+using Speckle.Core.Models;
+using System;
+using System.Collections.Generic;
+
+namespace DesktopUI2
+{
+  /// <summary>
+  /// Notifies that the selection has changed
+  /// </summary>
+  /// <param name="objects"></param>
+  public delegate void UpdateSelection(MappingSelectionInfo info);
+
+  /// <summary>
+  /// Notifies that the existing elements with a schema in the Doc have changed
+  /// </summary>
+  /// <param name="schemas"></param>
+  public delegate void UpdateExistingSchemaElements(List<Schema> schemas);
+
+  public class MappingSelectionInfo
+  {
+    public List<Schema> Schemas { get; set; }
+    public int Count { get; set; }
+
+    public MappingSelectionInfo(List<Schema> schemas, int count)
+    {
+      Schemas = schemas;
+      Count = count;
+    }
+  }
+  public abstract class MappingsBindings
+  {
+
+    #region delegates
+
+    public UpdateSelection UpdateSelection;
+    public UpdateExistingSchemaElements UpdateExistingSchemaElements;
+
+    #endregion
+    /// <summary>
+    /// Gets the selected objects in the host application
+    /// </summary>
+    /// <returns></returns>
+    public abstract MappingSelectionInfo GetSelectionInfo();
+
+    /// <summary>
+    /// Gets all the objects with a schema in the host application
+    /// </summary>
+    /// <returns></returns>
+    public abstract List<Schema> GetExistingSchemaElements();
+
+    /// <summary>
+    /// Sets the mappings on the current selection
+    /// </summary>
+    /// <param name="schema">The schema to be applied, has to be an Objects class and have appropriate converter</param>
+    /// <param name="viewModel">An ISchema View Model to easily restore the mappings in the Mapping Tool</param>
+    public abstract void SetMappings(string schema, string viewModel);
+
+
+    /// <summary>
+    /// Clears the mappings on the current selection
+    /// </summary>
+    public abstract void ClearMappings();
+
+    /// <summary>
+    /// Highlights a list of elements given their IDs
+    /// </summary>
+    /// <param name="ids"></param>
+    public abstract void HighlightElements(List<string> ids);
+
+
+    /// <summary>
+    /// Selects a list of elements given their IDs
+    /// </summary>
+    /// <param name="ids"></param>
+    public abstract void SelectElements(List<string> ids);
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Models/ConfigManager.cs b/DesktopUI2/DesktopUI2/Models/ConfigManager.cs
index faa14fc269..ffe269c697 100644
--- a/DesktopUI2/DesktopUI2/Models/ConfigManager.cs
+++ b/DesktopUI2/DesktopUI2/Models/ConfigManager.cs
@@ -1,5 +1,6 @@
 using Speckle.Core.Transports;
 using Speckle.Newtonsoft.Json;
+using System;
 
 namespace DesktopUI2.Models
 {
@@ -13,16 +14,29 @@ public static class ConfigManager
 
     public static void Save(Config config)
     {
-      ConfigStorage.UpdateObject("config", JsonConvert.SerializeObject(config));
+      ConfigStorage.UpdateObject("configDUI", JsonConvert.SerializeObject(config));
     }
 
     public static Config Load()
     {
       try
       {
-        return JsonConvert.DeserializeObject<Config>(ConfigStorage.GetObject("config"));
+        //dui and manager were sharing the same config!
+        //splitting them to avoid overwriting settings
+        var oldConfig = ConfigStorage.GetObject("config");
+        var newConfig = ConfigStorage.GetObject("configDUI");
+
+        if (!string.IsNullOrEmpty(newConfig))
+        {
+          return JsonConvert.DeserializeObject<Config>(newConfig);
+        }
+
+        return JsonConvert.DeserializeObject<Config>(oldConfig);
+      }
+      catch (Exception e)
+      {
+
       }
-      catch { }
       return new Config();
     }
   }
@@ -33,6 +47,7 @@ public static Config Load()
   public class Config
   {
     public bool DarkTheme { set; get; }
+    public bool OneClickMode { set; get; } = true;
     public bool ShowImportExportAlert { set; get; } = true;
   }
 
diff --git a/DesktopUI2/DesktopUI2/Models/Filters/FilterUtils.cs b/DesktopUI2/DesktopUI2/Models/Filters/SelectionFilterConverter.cs
similarity index 95%
rename from DesktopUI2/DesktopUI2/Models/Filters/FilterUtils.cs
rename to DesktopUI2/DesktopUI2/Models/Filters/SelectionFilterConverter.cs
index be86ebdfde..173e4717ee 100644
--- a/DesktopUI2/DesktopUI2/Models/Filters/FilterUtils.cs
+++ b/DesktopUI2/DesktopUI2/Models/Filters/SelectionFilterConverter.cs
@@ -47,7 +47,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
       }
       else
       {
-        throw new SpeckleException($"Unknown filter type: {type}. Please add a case in DesktopUI2.Models.Filters.FilerUtils.cs");
+        throw new SpeckleException($"Unknown filter type: {type}. Please add a case in DesktopUI2.Models.Filters.SelectionFilterConverter.cs");
       }
 
       serializer.Populate(jsonObject.CreateReader(), filter);
diff --git a/DesktopUI2/DesktopUI2/Models/NotificationManager.cs b/DesktopUI2/DesktopUI2/Models/NotificationManager.cs
new file mode 100644
index 0000000000..d7c3fcfb2f
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Models/NotificationManager.cs
@@ -0,0 +1,158 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Notifications;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Rendering;
+using Avalonia.VisualTree;
+using System;
+using System.Collections;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+
+namespace DesktopUI2.Models
+{
+
+  /// <summary>
+  /// An <see cref="INotificationManager"/> that displays notifications in a <see cref="UserControl"/>.
+  /// Adapted from https://github.com/AvaloniaUI/Avalonia/blob/0.10.18/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+  /// To support User Controls
+  /// </summary>
+  [TemplatePart("PART_Items", typeof(Panel))]
+  [PseudoClasses(":topleft", ":topright", ":bottomleft", ":bottomright")]
+  public class NotificationManager : TemplatedControl, IManagedNotificationManager, ICustomSimpleHitTest
+  {
+    private IList _items;
+
+    /// <summary>
+    /// Defines the <see cref="Position"/> property.
+    /// </summary>
+    public static readonly StyledProperty<NotificationPosition> PositionProperty =
+      AvaloniaProperty.Register<NotificationManager, NotificationPosition>(nameof(Position), NotificationPosition.TopRight);
+
+    /// <summary>
+    /// Defines which corner of the screen notifications can be displayed in.
+    /// </summary>
+    /// <seealso cref="NotificationPosition"/>
+    public NotificationPosition Position
+    {
+      get { return GetValue(PositionProperty); }
+      set { SetValue(PositionProperty, value); }
+    }
+
+    /// <summary>
+    /// Defines the <see cref="MaxItems"/> property.
+    /// </summary>
+    public static readonly StyledProperty<int> MaxItemsProperty =
+      AvaloniaProperty.Register<NotificationManager, int>(nameof(MaxItems), 5);
+
+    /// <summary>
+    /// Defines the maximum number of notifications visible at once.
+    /// </summary>
+    public int MaxItems
+    {
+      get { return GetValue(MaxItemsProperty); }
+      set { SetValue(MaxItemsProperty, value); }
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NotificationManager"/> class.
+    /// </summary>
+    /// <param name="host">The window that will host the control.</param>
+    public NotificationManager()
+    {
+      UpdatePseudoClasses(Position);
+    }
+
+    static NotificationManager()
+    {
+      HorizontalAlignmentProperty.OverrideDefaultValue<NotificationManager>(Avalonia.Layout.HorizontalAlignment.Stretch);
+      VerticalAlignmentProperty.OverrideDefaultValue<NotificationManager>(Avalonia.Layout.VerticalAlignment.Stretch);
+    }
+    /// <inheritdoc/>
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+      var itemsControl = e.NameScope.Find<Panel>("PART_Items");
+      _items = itemsControl?.Children;
+    }
+
+    /// <inheritdoc/>
+    public void Show(INotification content)
+    {
+      Show(content as object);
+    }
+
+    /// <inheritdoc/>
+    public async void Show(object content)
+    {
+      if (_items == null)
+        return;
+
+      var notification = content as INotification;
+
+      var notificationControl = new NotificationCard
+      {
+        Content = content,
+        Classes = new Classes(notification?.Type.ToString())
+      };
+
+      if (notification != null)
+      {
+        notificationControl.NotificationClosed += (sender, args) =>
+        {
+          notification.OnClose?.Invoke();
+
+          _items.Remove(sender);
+        };
+      }
+
+      notificationControl.PointerPressed += (sender, args) =>
+      {
+        if (notification != null && notification.OnClick != null)
+        {
+          notification.OnClick.Invoke();
+        }
+
+          (sender as NotificationCard)?.Close();
+      };
+
+      _items.Add(notificationControl);
+
+      if (_items.OfType<NotificationCard>().Count(i => !i.IsClosing) > MaxItems)
+      {
+        _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
+      }
+
+      if (notification != null && notification.Expiration == TimeSpan.Zero)
+      {
+        return;
+      }
+
+      await Task.Delay(notification?.Expiration ?? TimeSpan.FromSeconds(7));
+
+      notificationControl.Close();
+    }
+
+    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    {
+      base.OnPropertyChanged(change);
+
+      if (change.Property == PositionProperty)
+      {
+        UpdatePseudoClasses(change.NewValue.GetValueOrDefault<NotificationPosition>());
+      }
+    }
+
+    private void UpdatePseudoClasses(NotificationPosition position)
+    {
+      PseudoClasses.Set(":topleft", position == NotificationPosition.TopLeft);
+      PseudoClasses.Set(":topright", position == NotificationPosition.TopRight);
+      PseudoClasses.Set(":bottomleft", position == NotificationPosition.BottomLeft);
+      PseudoClasses.Set(":bottomright", position == NotificationPosition.BottomRight);
+    }
+
+    public bool HitTest(Point point) => VisualChildren.HitTestCustom(point);
+  }
+}
\ No newline at end of file
diff --git a/DesktopUI2/DesktopUI2/Models/Settings/MultiSelectBoxSetting.cs b/DesktopUI2/DesktopUI2/Models/Settings/MultiSelectBoxSetting.cs
index 9ba7b68ff3..9524f23eb9 100644
--- a/DesktopUI2/DesktopUI2/Models/Settings/MultiSelectBoxSetting.cs
+++ b/DesktopUI2/DesktopUI2/Models/Settings/MultiSelectBoxSetting.cs
@@ -2,6 +2,7 @@
 using Avalonia.Controls.Selection;
 using DesktopUI2.Views.Settings;
 using ReactiveUI;
+using Speckle.Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -11,49 +12,41 @@
 
 namespace DesktopUI2.Models.Settings
 {
+  [JsonObject(MemberSerialization.OptIn)]
   public class MultiSelectBoxSetting : ReactiveObject, ISetting
   {
+    [JsonProperty]
     public string Type => typeof(MultiSelectBoxSetting).ToString();
+    [JsonProperty]
     public string Name { get; set; }
+    [JsonProperty]
     public string Slug { get; set; }
+    [JsonProperty]
     public string Icon { get; set; }
+    [JsonProperty]
     public string Description { get; set; }
-    public string DefaultValue = "None";
+
+    [JsonProperty]
     public List<string> Values { get; set; }
 
-    private string _selection;
-    public string Selection
-    {
-      get
-      {
-        if (Selections.Count == 0)
-          return DefaultValue;
-        return string.Join(", ", Selections);
-      }
-      set => this.RaiseAndSetIfChanged(ref _selection, value);
-    }
 
+
+    [JsonProperty]
+    public string Selection { get; set; }
+
+
+    //note this selection is not restored but it does not affect the functionality
     public SelectionModel<string> SelectionModel { get; }
     public void SelectionChanged(object sender, SelectionModelSelectionChangedEventArgs e)
     {
-      try
-      {
-        foreach (var sel in e.SelectedItems)
-          if (!Selections.Contains(sel))
-            Selections.Add(sel as string);
-        foreach (var unsel in e.DeselectedItems)
-          Selections.Remove(unsel as string);
-
-        this.RaisePropertyChanged("Selection");
-      }
-      catch (Exception ex)
-      {
-
-      }
+      Selection = string.Join(", ", SelectionModel.SelectedItems);
+      this.RaisePropertyChanged("Selection");
     }
-    public ObservableCollection<string> Selections { get; set; } = new ObservableCollection<string>();
+
     public Type ViewType { get; } = typeof(MultiSelectBoxSettingView);
+    [JsonProperty]
     public string Summary { get; set; }
+
     public MultiSelectBoxSetting()
     {
       SelectionModel = new SelectionModel<string>();
@@ -61,5 +54,6 @@ public MultiSelectBoxSetting()
       SelectionModel.SelectionChanged += SelectionChanged;
     }
 
+
   }
 }
diff --git a/DesktopUI2/DesktopUI2/Models/Settings/SettingsConverter.cs b/DesktopUI2/DesktopUI2/Models/Settings/SettingsConverter.cs
new file mode 100644
index 0000000000..2c195c768c
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Models/Settings/SettingsConverter.cs
@@ -0,0 +1,73 @@
+using DesktopUI2.Models.Settings;
+using Speckle.Core.Logging;
+using Speckle.Newtonsoft.Json;
+using Speckle.Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+
+namespace DesktopUI2.Models.Filters
+{
+  public class SettingsConverter : JsonConverter
+  {
+    public override bool CanConvert(Type objectType)
+    {
+      return objectType == typeof(ISetting);
+    }
+
+    public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+    {
+
+
+      var settings = new List<ISetting>();
+      JArray jsonArray = null;
+
+      try
+      {
+        jsonArray = JArray.Load(reader);
+      }
+      catch (Exception ex)
+      {
+        return settings;
+      }
+
+      foreach (JObject jsonObject in jsonArray)
+      {
+        ISetting setting = default(ISetting);
+        var type = jsonObject.Value<string>("Type");
+
+        if (type == typeof(CheckBoxSetting).ToString())
+        {
+          setting = new CheckBoxSetting();
+        }
+        else if (type == typeof(ListBoxSetting).ToString())
+        {
+          setting = new ListBoxSetting();
+        }
+        else if (type == typeof(MappingSeting).ToString())
+        {
+          setting = new MappingSeting();
+        }
+        else if (type == typeof(MultiSelectBoxSetting).ToString())
+        {
+          setting = new MultiSelectBoxSetting();
+        }
+        else
+        {
+          continue;
+        }
+
+        serializer.Populate(jsonObject.CreateReader(), setting);
+
+        settings.Add(setting);
+      }
+
+      return settings;
+
+    }
+
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+      serializer.Serialize(writer, value);
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Models/StreamState.cs b/DesktopUI2/DesktopUI2/Models/StreamState.cs
index 57e275b21d..772953002a 100644
--- a/DesktopUI2/DesktopUI2/Models/StreamState.cs
+++ b/DesktopUI2/DesktopUI2/Models/StreamState.cs
@@ -138,6 +138,8 @@ public Stream CachedStream
     [JsonConverter(typeof(SelectionFilterConverter))]
     public ISelectionFilter Filter { get; set; }
 
+    [JsonProperty]
+    [JsonConverter(typeof(SettingsConverter))]
     public List<ISetting> Settings { get; set; } = new List<ISetting>();
 
     //List of uniqueids of the currently selected objects
diff --git a/DesktopUI2/DesktopUI2/Styles/Button.xaml b/DesktopUI2/DesktopUI2/Styles/Button.xaml
index eeb7b378c2..3d31a88390 100644
--- a/DesktopUI2/DesktopUI2/Styles/Button.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/Button.xaml
@@ -1,7 +1,9 @@
 <Styles
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles">
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles">
   <Design.PreviewWith>
     <StackPanel
       Width="360"
@@ -17,6 +19,9 @@
         VerticalAlignment="Center"
         Classes="Flat"
         Content="Hello!" />
+
+      <Button Classes="Send" />
+      <Button Classes="SendFull" />
     </StackPanel>
   </Design.PreviewWith>
   <Style Selector="Button">
@@ -42,4 +47,327 @@
     <Setter Property="CornerRadius" Value="0" />
     <Setter Property="assists:ShadowAssist.ShadowDepth" Value="Depth0" />
   </Style>
+
+
+  <!--  SEND BUTTONS  -->
+
+  <Style Selector="icons|MaterialIcon#send">
+    <Setter Property="RenderTransform" Value="rotate(-30deg)" />
+  </Style>
+  <Style Selector="m|FloatingButton:pointerover icons|MaterialIcon#send">
+    <Setter Property="RenderTransform" Value="rotate(-45deg)" />
+  </Style>
+
+  <Style Selector="Button.Send">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Margin="4">
+          <m:FloatingButton
+            VerticalAlignment="Center"
+            Command="{Binding SendCommand, FallbackValue={x:Null}}"
+            IsDefault="True"
+            IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}, FallbackValue=True}"
+            ToolTip.Tip="Send to this stream and saves it">
+            <Button.Content>
+              <icons:MaterialIcon
+                Name="send"
+                Width="20"
+                Height="20"
+                Foreground="White"
+                Kind="CubeSend">
+                <icons:MaterialIcon.Transitions>
+                  <Transitions>
+                    <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" />
+                  </Transitions>
+                </icons:MaterialIcon.Transitions>
+              </icons:MaterialIcon>
+            </Button.Content>
+          </m:FloatingButton>
+
+          <Grid>
+            <ProgressBar
+              Width="40"
+              Height="40"
+              Classes="Circle"
+              IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}"
+              IsIndeterminate="{Binding Progress.IsIndeterminate, FallbackValue=True}"
+              IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}"
+              Maximum="{Binding Progress.Max}"
+              Value="{Binding Progress.Value}" />
+            <m:FloatingButton
+              assists:ButtonAssist.HoverColor="Transparent"
+              assists:ShadowAssist.ShadowDepth="0"
+              Background="Transparent"
+              Classes="Mini"
+              Command="{Binding CancelSendOrReceiveCommand}"
+              IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}"
+              IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}"
+              ToolTip.Tip="Cancel">
+              <Button.Content>
+                <icons:MaterialIcon
+                  Width="15"
+                  Height="15"
+                  Foreground="{DynamicResource PrimaryHueDarkBrush}"
+                  Kind="Close" />
+              </Button.Content>
+            </m:FloatingButton>
+          </Grid>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+
+
+  <Style Selector="Button.SendFull">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+          <Button
+            Width="200"
+            Height="40"
+            HorizontalAlignment="Center"
+            Command="{Binding SendCommand}"
+            CornerRadius="40"
+            IsDefault="True"
+            IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}, FallbackValue=True}"
+            ToolTip.Tip="Send to this stream and saves it">
+            <Button.Content>
+              <StackPanel Orientation="Horizontal" Spacing="12">
+
+                <icons:MaterialIcon
+                  Name="send"
+                  Width="20"
+                  Height="20"
+                  Foreground="White"
+                  Kind="CubeSend">
+                  <icons:MaterialIcon.Transitions>
+                    <Transitions>
+                      <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" />
+                    </Transitions>
+                  </icons:MaterialIcon.Transitions>
+                </icons:MaterialIcon>
+                <TextBlock
+                  Classes="ButtonText"
+                  FontWeight="Bold"
+                  Text="SEND" />
+              </StackPanel>
+
+            </Button.Content>
+          </Button>
+          <Grid IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}" IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}">
+            <ProgressBar
+              Width="200"
+              Height="40"
+              IsIndeterminate="{Binding Progress.IsIndeterminate, FallbackValue=True}"
+              Maximum="{Binding Progress.Max}"
+              Value="{Binding Progress.Value}">
+              <ProgressBar.Clip>
+                <PathGeometry>
+                  <PathFigure IsClosed="True" StartPoint="0,0">
+                    <LineSegment Point="180,0" />
+                    <ArcSegment Point="200,20" Size="20,20" />
+                    <ArcSegment Point="180,40" Size="20,20" />
+                    <LineSegment Point="20,40" />
+                    <ArcSegment Point="0,20" Size="20,20" />
+                    <ArcSegment Point="20,0" Size="20,20" />
+                  </PathFigure>
+                </PathGeometry>
+              </ProgressBar.Clip>
+            </ProgressBar>
+
+            <Button
+              Width="200"
+              Height="40"
+              assists:ButtonAssist.HoverColor="Transparent"
+              assists:ShadowAssist.ShadowDepth="0"
+              Background="Transparent"
+              Command="{Binding CancelSendOrReceiveCommand}"
+              CornerRadius="40"
+              ToolTip.Tip="Cancel">
+              <Button.Content>
+                <StackPanel Orientation="Horizontal" Spacing="12">
+                  <icons:MaterialIcon
+                    Width="20"
+                    Height="20"
+                    Foreground="White"
+                    Kind="Remove" />
+                  <TextBlock
+                    Classes="ButtonText"
+                    FontWeight="Bold"
+                    Text="CANCEL" />
+                </StackPanel>
+
+              </Button.Content>
+            </Button>
+          </Grid>
+
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <!--  RECEIVE BUTTONS  -->
+  <Style Selector="icons|MaterialIcon#receive">
+    <Setter Property="RenderTransform" Value="rotate(30deg) scaleX(-1)" />
+  </Style>
+  <Style Selector="m|FloatingButton:pointerover icons|MaterialIcon#receive">
+    <Setter Property="RenderTransform" Value="rotate(15deg) scaleX(-1)" />
+  </Style>
+
+  <Style Selector="Button.Receive">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Margin="4">
+          <m:FloatingButton
+            VerticalAlignment="Center"
+            Command="{Binding ReceiveCommand}"
+            IsDefault="True"
+            IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}}"
+            ToolTip.Tip="Receive from this stream and saves it">
+            <Button.Content>
+              <icons:MaterialIcon
+                Name="receive"
+                Width="20"
+                Height="20"
+                Foreground="White"
+                Kind="CubeSend"
+                ToolTip.Tip="Receive">
+                <icons:MaterialIcon.Transitions>
+                  <Transitions>
+                    <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" />
+                  </Transitions>
+                </icons:MaterialIcon.Transitions>
+
+              </icons:MaterialIcon>
+
+            </Button.Content>
+          </m:FloatingButton>
+
+          <Grid>
+            <ProgressBar
+              Width="40"
+              Height="40"
+              Classes="Circle"
+              IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}"
+              IsIndeterminate="{Binding Progress.IsIndeterminate, FallbackValue=True}"
+              IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}"
+              Maximum="{Binding Progress.Max}"
+              Value="{Binding Progress.Value}" />
+            <m:FloatingButton
+              assists:ButtonAssist.HoverColor="Transparent"
+              assists:ShadowAssist.ShadowDepth="0"
+              Background="Transparent"
+              Classes="Mini"
+              Command="{Binding CancelSendOrReceiveCommand}"
+              IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}"
+              IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}"
+              ToolTip.Tip="Cancel">
+              <Button.Content>
+                <icons:MaterialIcon
+                  Width="15"
+                  Height="15"
+                  Foreground="{DynamicResource PrimaryHueDarkBrush}"
+                  Kind="Close" />
+              </Button.Content>
+            </m:FloatingButton>
+          </Grid>
+        </Grid>
+
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+
+
+  <Style Selector="Button.ReceiveFull">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+          <Button
+            Width="200"
+            Height="40"
+            HorizontalAlignment="Center"
+            Command="{Binding ReceiveCommand}"
+            CornerRadius="40"
+            IsDefault="True"
+            IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}, FallbackValue=True}"
+            ToolTip.Tip="Receives from this stream and saves it">
+            <Button.Content>
+              <StackPanel Orientation="Horizontal" Spacing="12">
+
+                <icons:MaterialIcon
+                  Name="receive"
+                  Width="20"
+                  Height="20"
+                  Foreground="White"
+                  Kind="CubeSend"
+                  ToolTip.Tip="Receive">
+                  <icons:MaterialIcon.Transitions>
+                    <Transitions>
+                      <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" />
+                    </Transitions>
+                  </icons:MaterialIcon.Transitions>
+
+                </icons:MaterialIcon>
+                <TextBlock
+                  Classes="ButtonText"
+                  FontWeight="Bold"
+                  Text="RECEIVE" />
+              </StackPanel>
+
+            </Button.Content>
+          </Button>
+          <Grid IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}" IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}">
+            <ProgressBar
+              Width="200"
+              Height="40"
+              IsIndeterminate="{Binding Progress.IsIndeterminate, FallbackValue=True}"
+              Maximum="{Binding Progress.Max}"
+              Value="{Binding Progress.Value}">
+              <ProgressBar.Clip>
+                <PathGeometry>
+                  <PathFigure IsClosed="True" StartPoint="0,0">
+                    <LineSegment Point="180,0" />
+                    <ArcSegment Point="200,20" Size="20,20" />
+                    <ArcSegment Point="180,40" Size="20,20" />
+                    <LineSegment Point="20,40" />
+                    <ArcSegment Point="0,20" Size="20,20" />
+                    <ArcSegment Point="20,0" Size="20,20" />
+                  </PathFigure>
+                </PathGeometry>
+              </ProgressBar.Clip>
+            </ProgressBar>
+
+            <Button
+              Width="200"
+              Height="40"
+              assists:ButtonAssist.HoverColor="Transparent"
+              assists:ShadowAssist.ShadowDepth="0"
+              Background="Transparent"
+              Command="{Binding CancelSendOrReceiveCommand}"
+              CornerRadius="40"
+              ToolTip.Tip="Cancel">
+              <Button.Content>
+                <StackPanel Orientation="Horizontal" Spacing="12">
+                  <icons:MaterialIcon
+                    Width="20"
+                    Height="20"
+                    Foreground="White"
+                    Kind="Remove" />
+                  <TextBlock
+                    Classes="ButtonText"
+                    FontWeight="Bold"
+                    Text="CANCEL" />
+                </StackPanel>
+
+              </Button.Content>
+            </Button>
+          </Grid>
+
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
 </Styles>
diff --git a/DesktopUI2/DesktopUI2/Styles/ComboBox.xaml b/DesktopUI2/DesktopUI2/Styles/ComboBox.xaml
index 7881094533..b638906a8f 100644
--- a/DesktopUI2/DesktopUI2/Styles/ComboBox.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/ComboBox.xaml
@@ -1,6 +1,7 @@
 <Styles
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
   xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:ripple="clr-namespace:Material.Ripple;assembly=Material.Ripple">
   <Style Selector="ComboBoxItem">
@@ -55,6 +56,27 @@
     <Setter Property="IsVisible" Value="False" />
   </Style>
 
+  <!--<Style Selector="ComboBox.Outline  /template/ ContentPresenter#contentPresenter">
+    <Setter Property="Margin" Value="0" />
+  </Style>-->
+
+  <!--<Style Selector="ComboBox.Outline">
+    <Setter Property="Padding" Value="5,0" />
+  </Style>-->
+
+  <Style Selector="ComboBox.Outline:not(:focus-within)">
+    <Setter Property="BorderBrush" Value="Gray" />
+  </Style>
+
+  <Style Selector="ComboBox.Outline /template/ TextBlock#floatingWatermark">
+    <Setter Property="FontSize" Value="14" />
+    <Setter Property="FontWeight" Value="Regular" />
+  </Style>
+
+	<Style Selector="ComboBox.Outline /template/ Grid#PART_RootBorder">
+		<Setter Property="MinHeight" Value="0" />
+	</Style>
+
 
   <Design.PreviewWith>
     <Border
@@ -62,9 +84,12 @@
       Height="200"
       Padding="20">
       <StackPanel VerticalAlignment="Top">
-        <ComboBox PlaceholderText="test">
+        <ComboBox
+          assists:ComboBoxAssist.Label="Revit Element"
+          Classes="Outline"
+          PlaceholderText="test">
 
-          <ComboBox.ItemTemplate>
+          <!--<ComboBox.ItemTemplate>
             <DataTemplate>
               <Grid ColumnDefinitions="auto,auto,auto,*">
                 <icons:MaterialIcon
@@ -83,7 +108,7 @@
               </Grid>
             </DataTemplate>
 
-          </ComboBox.ItemTemplate>
+          </ComboBox.ItemTemplate>-->
           <ComboBox.Items>
             <ComboBoxItem Content="Item 1Item 1Item 1Item 1Item 1Item 1Item 1" />
             <ComboBoxItem Content="Item 2" />
diff --git a/DesktopUI2/DesktopUI2/Styles/Expander.xaml b/DesktopUI2/DesktopUI2/Styles/Expander.xaml
index c3cb261edf..d0c335191d 100644
--- a/DesktopUI2/DesktopUI2/Styles/Expander.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/Expander.xaml
@@ -35,7 +35,7 @@
       </Expander>
       <Expander
         Margin="0,10"
-        Classes="Flat Transparent"
+        Classes="Minimal Transparent"
         Header="This is another expander!">
         <TextBlock Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget." TextWrapping="Wrap" />
       </Expander>
@@ -74,4 +74,150 @@
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
   </Style>
 
+  <Style Selector="Expander.Transparent">
+    <Setter Property="assists:ShadowAssist.ShadowDepth" Value="Depth0" />
+    <Setter Property="Background" Value="Transparent" />
+  </Style>
+
+  <Style Selector="Expander.Edit">
+    <Setter Property="assists:ShadowAssist.ShadowDepth" Value="Depth0" />
+    <Setter Property="Background" Value="Transparent" />
+  </Style>
+
+  <Style Selector="Expander.Transparent /template/ ToggleButton#PART_toggle">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border
+          MinHeight="48"
+          Padding="8"
+          Background="Transparent">
+          <Grid ColumnDefinitions="Auto,*">
+            <ContentPresenter
+              Name="PART_ContentPresenter"
+              Grid.Column="1"
+              Padding="0"
+              VerticalAlignment="Center"
+              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+              Background="Transparent"
+              Content="{TemplateBinding Content}" />
+            <Border
+              Grid.Column="0"
+              Margin="0,0,10,0"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center">
+
+              <Path
+                Name="PART_ExpandIcon"
+                Width="16"
+                Height="16"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 6.013 11.606 L 9.219 8.4 L 6.013 5.187 L 7 4.2 L 11.2 8.4 L 7 12.6 L 6.013 11.606 Z"
+                Fill="Gray" />
+
+
+            </Border>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+
+  <!--<Style Selector="Expander.Edit:down /template/ ToggleButton#PART_toggle /template/ TextBlock#PART_Close">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="Expander.Edit:down:expanded /template/ ToggleButton#PART_toggle /template/ TextBlock#PART_Edit">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>-->
+
+  <!--  TRANSPARENT EXPANDER, remove borders on header  -->
+  <Style Selector="Expander.Minimal /template/ ToggleButton#PART_toggle">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border
+          MinHeight="48"
+          Padding="8"
+          Background="Transparent">
+          <Grid ColumnDefinitions="Auto,*">
+            <ContentPresenter
+              Name="PART_ContentPresenter"
+              Grid.Column="1"
+              Padding="0"
+              VerticalAlignment="Center"
+              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+              Background="Transparent"
+              Content="{TemplateBinding Content}" />
+            <Border
+              Grid.Column="0"
+              Margin="0,0,10,0"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center">
+
+              <Path
+                Name="PART_ExpandIcon"
+                Width="16"
+                Height="16"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 6.013 11.606 L 9.219 8.4 L 6.013 5.187 L 7 4.2 L 11.2 8.4 L 7 12.6 L 6.013 11.606 Z"
+                Fill="Gray" />
+
+
+            </Border>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+
+
+  <Style Selector="Expander.Edit /template/ ToggleButton#PART_toggle">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border MinHeight="48" Background="Transparent">
+          <Grid ColumnDefinitions="*,auto">
+            <ContentPresenter
+              Name="PART_ContentPresenter"
+              Grid.Column="0"
+              Padding="0"
+              VerticalAlignment="Center"
+              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+              Background="Transparent"
+              Content="{TemplateBinding Content}" />
+            <Border
+              Grid.Column="1"
+              Margin="0,0,10,0"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center">
+              <StackPanel Orientation="Horizontal">
+                <TextBlock
+                  Name="PART_Edit"
+                  Margin="0,0,5,0"
+                  Classes="Overline"
+                  Foreground="{DynamicResource PrimaryHueMidBrush}"
+                  Text="Edit" />
+                <!--<Path
+                  Name="PART_ExpandIcon"
+                  Width="16"
+                  Height="16"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="M 6.013 11.606 L 9.219 8.4 L 6.013 5.187 L 7 4.2 L 11.2 8.4 L 7 12.6 L 6.013 11.606 Z"
+                  Fill="Gray" />-->
+              </StackPanel>
+
+
+
+            </Border>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
 </Styles>
diff --git a/DesktopUI2/DesktopUI2/Styles/ListBox.xaml b/DesktopUI2/DesktopUI2/Styles/ListBox.xaml
index 94aa6badfb..888efca8bd 100644
--- a/DesktopUI2/DesktopUI2/Styles/ListBox.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/ListBox.xaml
@@ -1,14 +1,17 @@
 <Styles
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles">
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:ripple="clr-namespace:Material.Ripple;assembly=Material.Ripple">
   <Design.PreviewWith>
     <Border
       Width="360"
       Height="200"
       Padding="20">
       <StackPanel VerticalAlignment="Center">
-        <ListBox>
+
+
+        <ListBox SelectionMode="Multiple">
           <ListBox.Items>
             <ListBoxItem Content="Item 1" IsSelected="True" />
             <ListBoxItem Content="Item 2" />
@@ -16,11 +19,28 @@
           </ListBox.Items>
         </ListBox>
 
+
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SpeckleBlue}" />
+
+  <Style Selector="ListBox.no-ripple ListBoxItem/template/ ripple|RippleEffect#Ripple">
+    <Setter Property="IsEnabled" Value="False" />
   </Style>
 
+
+
+
+  <!--<Style Selector=" ListBox.no-ripple ListBoxItem:selected /template/ Border#pointerOverBorder">
+    <Setter Property="Opacity" Value="0" />
+  </Style>-->
+
+
+  <!--<Style Selector=" ListBox.no-ripple ListBoxItem:selected /template/ Border#pointerOverBorder">
+    <Setter Property="Opacity" Value="0" />
+  </Style>-->
+  <!--<Style Selector="ListBoxItem:selected /template/ ContentPresenter">
+    <Setter Property="Background" Value="{DynamicResource SpeckleBlue}" />
+  </Style>-->
+
 </Styles>
diff --git a/DesktopUI2/DesktopUI2/Styles/MenuItem.xaml b/DesktopUI2/DesktopUI2/Styles/MenuItem.xaml
index 16660562fe..b56b04bcde 100644
--- a/DesktopUI2/DesktopUI2/Styles/MenuItem.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/MenuItem.xaml
@@ -1,11 +1,11 @@
 <Styles
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
   xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
   xmlns:ripple="clr-namespace:Material.Ripple;assembly=Material.Ripple"
-  xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
-  xmlns:system="clr-namespace:System;assembly=netstandard">
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Design.PreviewWith>
     <Border
       Width="250"
@@ -47,6 +47,10 @@
 
   <Style Selector="MenuItem">
     <Setter Property="Height" Value="28" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border
@@ -56,28 +60,43 @@
           BorderThickness="{TemplateBinding BorderThickness}">
           <Panel>
             <Border Name="PART_MenuItemHighlighter" Background="{DynamicResource MaterialDesignBody}" />
-            <ripple:RippleEffect RippleFill="{DynamicResource MaterialDesignFlatButtonRipple}">
+            <ripple:RippleEffect Name="PART_Ripple" RippleFill="{DynamicResource MaterialDesignFlatButtonRipple}">
               <Grid Margin="{TemplateBinding Padding}">
                 <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="10" />
                   <ColumnDefinition Width="*" />
                   <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
-                  <ColumnDefinition Width="28" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="10" />
                 </Grid.ColumnDefinitions>
-                <ContentPresenter
-                  Name="icon"
-                  Grid.Column="1"
-                  Width="28"
-                  HorizontalAlignment="Center"
-                  VerticalAlignment="Center"
-                  Content="{TemplateBinding Icon}" />
+                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                  <ContentPresenter
+                    Name="PART_Icon"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Content="{TemplateBinding Icon}"
+                    IsVisible="{TemplateBinding Icon,
+                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
+                  <ContentPresenter
+                    Name="PART_HeaderPresenter"
+                    VerticalAlignment="Center"
+                    Content="{TemplateBinding Header}">
+                    <ContentPresenter.DataTemplates>
+                      <DataTemplate DataType="sys:String">
+                        <AccessText Text="{CompiledBinding}" />
+                      </DataTemplate>
+                    </ContentPresenter.DataTemplates>
+                  </ContentPresenter>
+                </StackPanel>
+
                 <TextBlock
                   Name="PART_InputGestureText"
-                  Grid.Column="3"
+                  Grid.Column="2"
+                  Margin="24,0,0,0"
                   VerticalAlignment="Center"
                   Text="{TemplateBinding InputGesture,
                                          Converter={StaticResource KeyGestureConverter}}" />
+
                 <Path
                   Name="check"
                   Grid.Column="0"
@@ -86,34 +105,25 @@
                   Data="F1M10,1.2L4.7,9.1 4.5,9.1 0,5.2 1.3,3.5 4.3,6.1 8.3,0 10,1.2z"
                   Fill="{TemplateBinding Foreground}"
                   IsVisible="False" />
-                <ContentPresenter
-                  Name="PART_HeaderPresenter"
-                  Grid.Column="2"
-                  Margin="2,0"
-                  VerticalAlignment="Center"
-                  Content="{TemplateBinding Header}">
-                  <ContentPresenter.DataTemplates>
-                    <DataTemplate DataType="system:String">
-                      <AccessText Text="{Binding}" />
-                    </DataTemplate>
-                  </ContentPresenter.DataTemplates>
-                </ContentPresenter>
+
                 <Path
                   Name="rightArrow"
-                  Grid.Column="4"
+                  Grid.Column="3"
                   Margin="10,0,0,0"
                   VerticalAlignment="Center"
                   Data="M0,0L4,3.5 0,7z"
                   Fill="{TemplateBinding Foreground}" />
+                <!--  Pull request #143 from tpetruk/fix-context-menus  -->
+                <!--  ... IsLightDismissEnabled="False" ...  -->
                 <Popup
                   Name="PART_Popup"
                   Grid.Column="0"
-                  IsLightDismissEnabled="True"
+                  IsLightDismissEnabled="False"
                   IsOpen="{TemplateBinding IsSubMenuOpen,
                                            Mode=TwoWay}"
                   PlacementMode="Right">
-                  <styles:Card Padding="0">
-                    <Border Name="MainBorder" BorderThickness="{TemplateBinding BorderThickness}">
+                  <m:Card Padding="0">
+                    <Border Name="PART_MainBorder" BorderThickness="{TemplateBinding BorderThickness}">
                       <ScrollViewer>
                         <ItemsPresenter
                           Name="PART_ItemsPresenter"
@@ -123,7 +133,7 @@
                           ItemsPanel="{TemplateBinding ItemsPanel}" />
                       </ScrollViewer>
                     </Border>
-                  </styles:Card>
+                  </m:Card>
                 </Popup>
               </Grid>
             </ripple:RippleEffect>
@@ -132,22 +142,28 @@
       </ControlTemplate>
     </Setter>
   </Style>
+
+
+  <!--  Default style: MenuItem icon  -->
+  <Style Selector="MenuItem /template/ ContentPresenter#PART_Icon">
+    <Setter Property="Width" Value="24" />
+    <Setter Property="Height" Value="24" />
+    <Setter Property="Margin" Value="0, 0, 10, 0" />
+  </Style>
+
   <Style Selector="MenuItem:separator">
     <Setter Property="Template">
       <ControlTemplate>
         <Separator
           Height="1"
-          Margin="20,1,0,1"
+          Margin="0,8"
           Background="{DynamicResource PrimaryHueMidBrush}" />
       </ControlTemplate>
     </Setter>
   </Style>
 
-
-
-
   <Style Selector="Menu &gt; MenuItem">
-    <Setter Property="Padding" Value="4" />
+    <!--<Setter Property="Padding" Value="4" />-->
     <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type TemplatedControl}}, Path=Foreground}" />
     <Setter Property="Template">
       <ControlTemplate>
@@ -158,9 +174,9 @@
               Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}}"
               HorizontalContentAlignment="Center"
               VerticalContentAlignment="Center"
-          CornerRadius="20"
               Classes="Flat TransparentBack ConstantForeground"
               Content="{TemplateBinding Header}"
+              CornerRadius="20"
               Foreground="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}"
               IsChecked="{TemplateBinding IsSubMenuOpen,
                                           Mode=TwoWay}">
@@ -170,7 +186,7 @@
                 </Style>
               </ToggleButton.Styles>
               <ToggleButton.DataTemplates>
-                <DataTemplate DataType="system:String">
+                <DataTemplate DataType="sys:String">
                   <AccessText Text="{Binding}" />
                 </DataTemplate>
               </ToggleButton.DataTemplates>
@@ -182,7 +198,7 @@
               IsOpen="{TemplateBinding IsSubMenuOpen,
                                        Mode=TwoWay}"
               WindowManagerAddShadowHint="False">
-              <styles:Card Margin="8" Padding="0">
+              <m:Card Margin="8" Padding="0">
                 <Border Name="MainBorder" BorderThickness="{TemplateBinding BorderThickness}">
                   <ScrollViewer>
                     <ItemsPresenter
@@ -193,20 +209,43 @@
                       ItemsPanel="{TemplateBinding ItemsPanel}" />
                   </ScrollViewer>
                 </Border>
-              </styles:Card>
+              </m:Card>
             </Popup>
           </Panel>
         </Border>
       </ControlTemplate>
     </Setter>
   </Style>
+
+  <Style Selector="MenuItem /template/ Border#PART_MenuItemHighlighter">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+
+  <Style Selector="MenuItem:not(.Menu):not(:disabled):selected /template/ Border#PART_MenuItemHighlighter">
+    <Setter Property="Opacity" Value="0.13" />
+  </Style>
+
+  <Style Selector="MenuItem:not(.Menu):disabled">
+    <Setter Property="Opacity" Value="0.56" />
+  </Style>
+
+  <Style Selector="Menu &gt; MenuItem">
+    <Setter Property="Focusable" Value="False" />
+  </Style>
+
+  <Style Selector="MenuItem:empty /template/ Path#rightArrow">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+
   <Style Selector="MenuItem AccessText">
     <Setter Property="FontSize" Value="12" />
+    <Setter Property="FontWeight" Value="Regular" />
+    <Setter Property="FontFamily" Value="avares://Material.Styles/Fonts/Roboto#Roboto" />
   </Style>
 
 
   <!--  NO HIGHLIGHT  -->
-  <Style Selector="Menu &gt; MenuItem.NoHighlight">
+  <!--<Style Selector="Menu &gt; MenuItem.NoHighlight">
 
     <Setter Property="Template">
       <ControlTemplate>
@@ -218,9 +257,9 @@
               Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}}"
               HorizontalContentAlignment="Center"
               VerticalContentAlignment="Center"
-              CornerRadius="20"
               Classes="Flat TransparentBack ConstantForeground"
               Content="{TemplateBinding Header}"
+              CornerRadius="20"
               Foreground="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}"
               IsChecked="{TemplateBinding IsSubMenuOpen,
                                           Mode=TwoWay}">
@@ -310,7 +349,7 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
+  </Style>-->
 </Styles>
 
 
diff --git a/DesktopUI2/DesktopUI2/Styles/NotificationCard.xaml b/DesktopUI2/DesktopUI2/Styles/NotificationCard.xaml
new file mode 100644
index 0000000000..147767ea09
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Styles/NotificationCard.xaml
@@ -0,0 +1,132 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="0" Background="White">
+      <StackPanel Orientation="Vertical">
+        <NotificationCard Classes="Error" Content="Testing" />
+        <NotificationCard Classes="Warning" Content="Testing" />
+        <NotificationCard Classes="Success" Content="Testing" />
+      </StackPanel>
+
+    </Border>
+  </Design.PreviewWith>
+
+
+
+  <Style Selector="NotificationCard /template/ ContentControl#PART_Content">
+    <Setter Property="MinHeight" Value="0" />
+  </Style>
+
+
+  <Style Selector="NotificationCard">
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="MinWidth" Value="350" />
+    <Setter Property="Width" Value="NaN" />
+    <Setter Property="FontSize" Value="14" />
+    <Setter Property="Foreground" Value="White" />
+    <Setter Property="RenderTransformOrigin" Value="50%,75%" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="VerticalAlignment" Value="Bottom" />
+    <Setter Property="CornerRadius" Value="20" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="Margin" Value="5,0" />
+    <Setter Property="Cursor" Value="Hand" />
+    <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
+          <Border
+            Margin="5,0,5,10"
+            BoxShadow="0 6 8 0 #4F000000"
+            CornerRadius="{TemplateBinding CornerRadius}">
+            <Border
+              Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              ClipToBounds="True"
+              CornerRadius="{TemplateBinding CornerRadius}">
+              <DockPanel>
+                <Panel
+                  x:Name="PART_HeaderBar"
+                  Height="4"
+                  DockPanel.Dock="Top" />
+                <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
+              </DockPanel>
+            </Border>
+          </Border>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+
+    <Style.Animations>
+      <Animation
+        Easing="QuadraticEaseIn"
+        FillMode="Forward"
+        Duration="0:0:0.45">
+        <KeyFrame Cue="0%">
+          <Setter Property="Opacity" Value="0" />
+          <Setter Property="TranslateTransform.Y" Value="20" />
+          <Setter Property="ScaleTransform.ScaleX" Value="0.85" />
+          <Setter Property="ScaleTransform.ScaleY" Value="0.85" />
+        </KeyFrame>
+        <KeyFrame Cue="30%">
+          <Setter Property="TranslateTransform.Y" Value="-20" />
+        </KeyFrame>
+        <KeyFrame Cue="100%">
+          <Setter Property="Opacity" Value="1" />
+          <Setter Property="TranslateTransform.Y" Value="0" />
+          <Setter Property="ScaleTransform.ScaleX" Value="1" />
+          <Setter Property="ScaleTransform.ScaleY" Value="1" />
+        </KeyFrame>
+      </Animation>
+    </Style.Animations>
+  </Style>
+
+
+
+  <Style Selector="NotificationCard[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
+    <Setter Property="RenderTransformOrigin" Value="50%,0%" />
+    <Style.Animations>
+      <Animation
+        Easing="QuadraticEaseOut"
+        FillMode="Forward"
+        Duration="0:0:0.75">
+        <KeyFrame Cue="0%">
+          <Setter Property="TranslateTransform.X" Value="0" />
+          <Setter Property="ScaleTransform.ScaleY" Value="1" />
+        </KeyFrame>
+        <KeyFrame Cue="70%">
+          <Setter Property="TranslateTransform.X" Value="800" />
+          <Setter Property="ScaleTransform.ScaleY" Value="1" />
+        </KeyFrame>
+        <KeyFrame Cue="100%">
+          <Setter Property="ScaleTransform.ScaleY" Value="0" />
+          <Setter Property="TranslateTransform.X" Value="800" />
+        </KeyFrame>
+      </Animation>
+    </Style.Animations>
+  </Style>
+
+  <Style Selector="NotificationCard[IsClosing=true]">
+    <Style.Animations>
+      <Animation
+        Easing="QuadraticEaseOut"
+        FillMode="Forward"
+        Duration="0:0:1.25">
+        <KeyFrame Cue="100%">
+          <Setter Property="IsClosed" Value="True" />
+        </KeyFrame>
+      </Animation>
+    </Style.Animations>
+  </Style>
+
+  <Style Selector="NotificationCard.Success">
+    <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
+  </Style>
+  <Style Selector="NotificationCard.Warning">
+    <Setter Property="Background" Value="Goldenrod" />
+  </Style>
+  <Style Selector="NotificationCard.Error">
+    <Setter Property="Background" Value="Salmon" />
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/DesktopUI2/DesktopUI2/Styles/NotificationManager.xaml b/DesktopUI2/DesktopUI2/Styles/NotificationManager.xaml
new file mode 100644
index 0000000000..24acc5d01e
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Styles/NotificationManager.xaml
@@ -0,0 +1,61 @@
+<Styles
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:l="clr-namespace:DesktopUI2.Models"
+  xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
+  x:CompileBindings="True"
+  x:DataType="l:NotificationManager">
+
+
+  <Design.PreviewWith>
+
+
+    <Border Padding="0" Background="White">
+      <NotificationCard Content="Testing" />
+    </Border>
+
+  </Design.PreviewWith>
+
+  <Style Selector="l|NotificationManager">
+    <Setter Property="Margin" Value="0 0" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ReversibleStackPanel Name="PART_Items">
+          <ReversibleStackPanel.DataTemplates>
+            <DataTemplate DataType="INotification">
+              <StackPanel
+                Margin="12"
+                Spacing="8"
+                TextBlock.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
+                <TextBlock FontWeight="Medium" Text="{Binding Title}" />
+                <TextBlock
+                  MaxHeight="80"
+                  Margin="0,0,12,0"
+									Opacity="0.8"
+                  Text="{Binding Message}"
+                  TextWrapping="Wrap" />
+              </StackPanel>
+            </DataTemplate>
+            <DataTemplate DataType="x:String">
+              <TextBlock
+                Margin="12"
+                Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
+                Text="{Binding}" />
+            </DataTemplate>
+          </ReversibleStackPanel.DataTemplates>
+        </ReversibleStackPanel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="l|NotificationManager.BottomStretch /template/ ReversibleStackPanel#PART_Items">
+    <Setter Property="ReverseOrder" Value="True" />
+    <Setter Property="VerticalAlignment" Value="Bottom" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Margin" Value="0,0,0,10" />
+
+  </Style>
+
+</Styles>
+
+
diff --git a/DesktopUI2/DesktopUI2/Styles/Styles.xaml b/DesktopUI2/DesktopUI2/Styles/Styles.xaml
index 470946f2cb..067085e6e1 100644
--- a/DesktopUI2/DesktopUI2/Styles/Styles.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/Styles.xaml
@@ -8,6 +8,9 @@
   <StyleInclude Source="/Styles/Dialog.xaml" />
   <StyleInclude Source="/Styles/Text.xaml" />
   <StyleInclude Source="/Styles/TextBox.xaml" />
+  <StyleInclude Source="/Styles/ListBox.xaml" />
   <StyleInclude Source="/Styles/Expander.xaml" />
   <StyleInclude Source="/Styles/ChipListBox.xaml" />
+  <StyleInclude Source="/Styles/NotificationCard.xaml" />
+  <StyleInclude Source="/Styles/NotificationManager.xaml" />
 </Styles>
diff --git a/DesktopUI2/DesktopUI2/Styles/TextBox.xaml b/DesktopUI2/DesktopUI2/Styles/TextBox.xaml
index 09280ac3f1..24420b35ae 100644
--- a/DesktopUI2/DesktopUI2/Styles/TextBox.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/TextBox.xaml
@@ -2,6 +2,7 @@
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:animations="clr-namespace:Material.Styles.Additional.Animations;assembly=Material.Styles"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
   xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:controls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
   xmlns:converters="clr-namespace:Material.Styles.Converters;assembly=Material.Styles"
@@ -11,7 +12,7 @@
   <Design.PreviewWith>
     <Border
       Width="360"
-      Height="200"
+      Height="400"
       Padding="20">
       <StackPanel Orientation="Vertical">
 
@@ -30,6 +31,11 @@
           I am read only
         </TextBox>
 
+        <TextBox
+          assists:TextFieldAssist.Label="Classic TextBox"
+          FontSize="13"
+          UseFloatingWatermark="True" />
+
 
         <TextBox
           Padding="0"
@@ -55,6 +61,12 @@
     <Setter Property="FontSize" Value="13.0" />
   </Style>
 
+  <Style Selector=" TextBox /template/ TextBlock.Subtitle1">
+    <Setter Property="FontSize" Value="13.0" />
+    <Setter Property="Foreground" Value="Gray" />
+  </Style>
+
+
   <Style Selector="TextBlock.Subtitle1#watermark">
     <Setter Property="FontSize" Value="13.0" />
   </Style>
diff --git a/DesktopUI2/DesktopUI2/Utils.cs b/DesktopUI2/DesktopUI2/Utils.cs
index c033ab1206..0f1063bb04 100644
--- a/DesktopUI2/DesktopUI2/Utils.cs
+++ b/DesktopUI2/DesktopUI2/Utils.cs
@@ -1,13 +1,19 @@
 using Avalonia.Controls;
 using Avalonia.Data;
 using DesktopUI2.ViewModels;
+using DesktopUI2.Views;
 using DesktopUI2.Views.Windows.Dialogs;
 using Material.Dialog;
 using Material.Dialog.Icons;
 using Material.Dialog.Interfaces;
 using Speckle.Core.Api;
+using Speckle.Core.Credentials;
+using Speckle.Core.Logging;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -196,5 +202,86 @@ public static Action<T> Debounce<T>(this Action<T> func, int milliseconds = 300)
             }, TaskScheduler.Default);
       };
     }
+
+    public static void LaunchManager()
+    {
+      try
+      {
+        string path = "";
+
+        Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Launch Manager" } });
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+          path = @"/Applications/Manager for Speckle.app";
+        }
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+          path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Speckle", "Manager", "Manager.exe");
+        }
+
+        if (File.Exists(path) || Directory.Exists(path))
+          Process.Start(path);
+        else
+        {
+          Process.Start(new ProcessStartInfo($"https://speckle.systems/download") { UseShellExecute = true });
+        }
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+      }
+    }
+
+    public static async Task AddAccountCommand()
+    {
+      try
+      {
+        //IsLoggingIn = true;
+
+
+        var dialog = new AddAccountDialog(AccountManager.GetDefaultServerUrl());
+        var result = await dialog.ShowDialog<string>();
+
+        if (result != null)
+        {
+          Uri u;
+          if (!Uri.TryCreate(result, UriKind.Absolute, out u))
+            Dialogs.ShowDialog("Error", "Invalid URL", Material.Dialog.Icons.DialogIconKind.Error);
+          else
+          {
+            try
+            {
+              Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Account Add" } });
+
+              await AccountManager.AddAccount(result);
+              await Task.Delay(1000);
+
+              MainViewModel.Instance.NavigateToDefaultScreen();
+            }
+            catch (Exception e)
+            {
+              Log.CaptureException(e, Sentry.SentryLevel.Error);
+
+              MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+              {
+                Title = "Something went wrong...",
+                Message = e.Message,
+                Expiration = TimeSpan.Zero,
+                Type = Avalonia.Controls.Notifications.NotificationType.Error,
+
+              });
+            }
+          }
+        }
+
+        //IsLoggingIn = false;
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+      }
+    }
   }
 }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/AccountViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/AccountViewModel.cs
index 381f3a4d62..a52c3062a7 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/AccountViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/AccountViewModel.cs
@@ -19,9 +19,22 @@ public string Role
       set => this.RaiseAndSetIfChanged(ref _role, value);
     }
     public string Id { get; }
+    public bool Pending { get; }
 
     public Account Account { get; private set; }
 
+    private Client _client { get; set; }
+    public Client Client
+    {
+      get
+      {
+        if (_client == null)
+          _client = new Client(Account);
+        return _client;
+
+      }
+    }
+
     public string SimpleName
     {
       get
@@ -57,7 +70,7 @@ public AccountViewModel(Account account)
 
     }
 
-    public AccountViewModel(User user)
+    public AccountViewModel(UserBase user)
     {
       Name = user.name;
       Id = user.id;
@@ -71,7 +84,15 @@ public AccountViewModel(Collaborator user)
       Id = user.id;
       AvatarUrl = user.avatar;
       Role = user.role;
+    }
 
+    public AccountViewModel(PendingStreamCollaborator user)
+    {
+      Name = user.title;
+      Id = user.id;
+      AvatarUrl = user?.user?.avatar;
+      Role = user.role;
+      Pending = true;
     }
 
 
@@ -157,6 +178,7 @@ private void SetImage(byte[] bytes)
     {
       System.IO.Stream stream = new MemoryStream(bytes);
       AvatarImage = new Avalonia.Media.Imaging.Bitmap(stream);
+      this.RaisePropertyChanged(nameof(AvatarImage));
 
     }
   }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/ActivityViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/ActivityViewModel.cs
index 5a6a00c25c..b82f37766c 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/ActivityViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/ActivityViewModel.cs
@@ -38,13 +38,13 @@ public ActivityViewModel(ActivityItem item, Client client)
           Margin = new Thickness(50, 10, 10, 0);
           Icon = "ArrowBottomLeft";
           Align = HorizontalAlignment.Right;
-          Message = $"received in {item.info.sourceApplication} • {Formatting.TimeAgo(item.time)}";
+          Message = $"received in {item?.info?.sourceApplication} • {Formatting.TimeAgo(item.time)}";
           break;
         case "commit_create":
           Margin = new Thickness(10, 10, 50, 0);
           Icon = "ArrowTopRight";
           Align = HorizontalAlignment.Left;
-          Message = $"sent from {item.info.commit.sourceApplication} • {Formatting.TimeAgo(item.time)}";
+          Message = $"sent from {item?.info?.commit?.sourceApplication} • {Formatting.TimeAgo(item.time)}";
           break;
         case "stream_create":
           Margin = new Thickness(10, 10, 10, 0);
diff --git a/DesktopUI2/DesktopUI2/ViewModels/Share/CollaboratorsViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/CollaboratorsViewModel.cs
similarity index 59%
rename from DesktopUI2/DesktopUI2/ViewModels/Share/CollaboratorsViewModel.cs
rename to DesktopUI2/DesktopUI2/ViewModels/CollaboratorsViewModel.cs
index a4e8cda960..5f6b252b6d 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/Share/CollaboratorsViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/CollaboratorsViewModel.cs
@@ -1,7 +1,12 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Selection;
+using Avalonia.Metadata;
+using Avalonia.Threading;
 using DesktopUI2.Models;
-using DesktopUI2.Views.Pages.ShareControls;
+using DesktopUI2.Views;
+using DesktopUI2.Views.Controls;
+using DesktopUI2.Views.Pages;
+using DesktopUI2.Views.Windows.Dialogs;
 using ReactiveUI;
 using Speckle.Core.Api;
 using Speckle.Core.Credentials;
@@ -13,15 +18,13 @@
 using System.Linq;
 using System.Reactive;
 
-namespace DesktopUI2.ViewModels.Share
+namespace DesktopUI2.ViewModels
 {
   public class CollaboratorsViewModel : ReactiveObject, IRoutableViewModel
   {
     public IScreen HostScreen { get; }
     public string UrlPathSegment { get; } = "collaborators";
 
-    private ConnectorBindings Bindings;
-
     #region bindings
 
     public ReactiveCommand<Unit, Unit> GoBack => MainViewModel.RouterInstance.NavigateBack;
@@ -67,8 +70,7 @@ public AccountViewModel SelectedUser
         {
           AddedUsers.Add(value);
           SearchQuery = "";
-          this.RaisePropertyChanged("AddedUsers");
-          this.RaisePropertyChanged("HasAddedUsers");
+          this.RaisePropertyChanged(nameof(AddedUsers));
         }
 
       }
@@ -85,6 +87,16 @@ private set
       }
     }
 
+    private bool _isDialog;
+    public bool IsDialog
+    {
+      get => _isDialog;
+      private set
+      {
+        this.RaiseAndSetIfChanged(ref _isDialog, value);
+      }
+    }
+
     private bool _showProgress;
     public bool ShowProgress
     {
@@ -105,11 +117,6 @@ private set
       }
     }
 
-    public bool HasAddedUsers
-    {
-      get => AddedUsers.Any();
-    }
-
     public bool HasSelectedUsers
     {
       get => SelectionModel.SelectedItems.Any();
@@ -120,12 +127,12 @@ public bool HasSelectedUsers
 
     private StreamViewModel _stream;
 
+
     public CollaboratorsViewModel(IScreen screen, StreamViewModel stream)
     {
       HostScreen = screen;
       _stream = stream;
       Role = stream.Stream.role;
-      Bindings = Locator.Current.GetService<ConnectorBindings>();
 
       userSearchDebouncer = Utils.Debounce(SearchUsers);
 
@@ -133,22 +140,51 @@ public CollaboratorsViewModel(IScreen screen, StreamViewModel stream)
       SelectionModel.SingleSelect = false;
       SelectionModel.SelectionChanged += SelectionModel_SelectionChanged;
 
-      foreach (var collab in stream.Stream.collaborators)
+      IsDialog = MainViewModel.RouterInstance.NavigationStack.Last() is CollaboratorsViewModel;
+
+      ReloadUsers();
+
+    }
+
+    internal void ReloadUsers()
+    {
+      AddedUsers = new ObservableCollection<AccountViewModel>();
+      foreach (var collab in _stream.Stream.collaborators)
       {
         //skip myself
-        if (_stream.StreamState.Client.Account.userInfo.id == collab.id)
-          continue;
+        //if (_stream.StreamState.Client.Account.userInfo.id == collab.id)
+        //  continue;
         AddedUsers.Add(new AccountViewModel(collab));
       }
+
+      foreach (var collab in _stream.Stream.pendingCollaborators)
+      {
+        AddedUsers.Add(new AccountViewModel(collab));
+      }
+
+      this.RaisePropertyChanged(nameof(AddedUsers));
     }
 
-    private void Search()
+    private async void Search()
     {
 
       Focus();
       if (SearchQuery.Length < 3)
         return;
 
+      if (!await Helpers.UserHasInternet())
+      {
+        Dispatcher.UIThread.Post(() =>
+          MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+          {
+            Title = "⚠️ Oh no!",
+            Message = "Could not reach the internet, are you connected?",
+            Type = Avalonia.Controls.Notifications.NotificationType.Error
+          }), DispatcherPriority.Background);
+
+        return;
+      }
+
       if (SearchQuery.Contains("@"))
       {
         if (Utils.IsValidEmail(SearchQuery))
@@ -174,7 +210,7 @@ private void Search()
     private void Focus()
     {
       DropDownOpen = false;
-      var searchBox = CollaboratorsView.Instance.FindControl<TextBox>("SearchBox");
+      var searchBox = CollaboratorsControl.Instance.FindControl<TextBox>("SearchBox");
       searchBox.Focus();
     }
 
@@ -200,13 +236,55 @@ private async void SearchUsers()
 
     }
 
-    private async void SaveCommand()
+    [DependsOn(nameof(AddedUsers))]
+    bool CanSaveCommand(object parameter)
+    {
+      foreach (var user in AddedUsers)
+      {
+        if (Utils.IsValidEmail(user.Name) && !_stream.Stream.pendingCollaborators.Any(x => x.title == user.Name))
+          return true;
+        if (!_stream.Stream.collaborators.Any(x => x.id == user.Id) && !_stream.Stream.pendingCollaborators.Any(x => x.id == user.Id))
+          return true;
+        if (!_stream.Stream.collaborators.Any(x => x.id == user.Id && x.role == user.Role) && !_stream.Stream.pendingCollaborators.Any(x => x.id == user.Id && x.role == user.Role))
+          return true;
+      }
+      foreach (var user in _stream.Stream.collaborators)
+      {
+        if (!AddedUsers.Any(x => x.Id == user.id))
+          return true;
+      }
+      foreach (var user in _stream.Stream.pendingCollaborators)
+      {
+        if (!AddedUsers.Any(x => x.Id == user.id))
+          return true;
+      }
+      return false;
+    }
+
+    async void SaveCommand()
     {
 
+      if (!await Helpers.UserHasInternet())
+      {
+        Dispatcher.UIThread.Post(() =>
+          MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+          {
+            Title = "⚠️ Oh no!",
+            Message = "Could not reach the internet, are you connected?",
+            Type = Avalonia.Controls.Notifications.NotificationType.Error
+          }), DispatcherPriority.Background);
+
+        return;
+      }
+
       foreach (var user in AddedUsers)
       {
+        //mismatch between roles set within the dropdown and existing ones
+        if (!user.Role.StartsWith("stream:"))
+          user.Role = "stream:" + user.Role;
+
         //invite users by email
-        if (Utils.IsValidEmail(user.Name))
+        if (Utils.IsValidEmail(user.Name) && !_stream.Stream.pendingCollaborators.Any(x => x.title == user.Name))
         {
           try
           {
@@ -215,33 +293,33 @@ private async void SaveCommand()
           }
           catch (Exception e)
           {
-
+            new SpeckleException("Error inviting user", e, true, Sentry.SentryLevel.Error);
           }
         }
         //add new collaborators
-        else if (!_stream.Stream.collaborators.Any(x => x.id == user.Id))
+        else if (!_stream.Stream.collaborators.Any(x => x.id == user.Id) && !_stream.Stream.pendingCollaborators.Any(x => x.id == user.Id))
         {
           try
           {
-            await _stream.StreamState.Client.StreamInviteCreate(new StreamInviteCreateInput { userId = user.Id, streamId = _stream.StreamState.StreamId, message = "I would like to share a model with you via Speckle!", role = "stream:" + user.Role });
+            await _stream.StreamState.Client.StreamInviteCreate(new StreamInviteCreateInput { userId = user.Id, streamId = _stream.StreamState.StreamId, message = "I would like to share a model with you via Speckle!", role = user.Role });
             Analytics.TrackEvent(_stream.StreamState.Client.Account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Stream Share" }, { "method", "Invite User" } });
           }
           catch (Exception e)
           {
-
+            new SpeckleException("Error adding collaborator", e, true, Sentry.SentryLevel.Error);
           }
         }
-        //update permissions
-        else
+        //update permissions, only if changed
+        else if (!_stream.Stream.collaborators.Any(x => x.id == user.Id && x.role == user.Role) && !_stream.Stream.pendingCollaborators.Any(x => x.id == user.Id && x.role == user.Role))
         {
           try
           {
-            await _stream.StreamState.Client.StreamUpdatePermission(new StreamPermissionInput { userId = user.Id, streamId = _stream.StreamState.StreamId, role = "stream:" + user.Role });
+            await _stream.StreamState.Client.StreamUpdatePermission(new StreamPermissionInput { userId = user.Id, streamId = _stream.StreamState.StreamId, role = user.Role });
             Analytics.TrackEvent(_stream.StreamState.Client.Account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Stream Share" }, { "method", "Update Permissions" } });
           }
           catch (Exception e)
           {
-
+            new SpeckleException("Error updating permissions", e, true, Sentry.SentryLevel.Error);
           }
         }
       }
@@ -258,7 +336,24 @@ private async void SaveCommand()
           }
           catch (Exception e)
           {
+            new SpeckleException("Error updating permissions", e, true, Sentry.SentryLevel.Error);
+          }
+        }
+      }
 
+      //revoke invites
+      foreach (var user in _stream.Stream.pendingCollaborators)
+      {
+        if (!AddedUsers.Any(x => x.Id == user.id))
+        {
+          try
+          {
+            await _stream.StreamState.Client.StreamInviteCancel(_stream.StreamState.StreamId, user.inviteId);
+            Analytics.TrackEvent(_stream.StreamState.Client.Account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Stream Share" }, { "method", "Cancel Invite" } });
+          }
+          catch (Exception e)
+          {
+            new SpeckleException("Error updating permissions", e, true, Sentry.SentryLevel.Error);
           }
         }
       }
@@ -266,14 +361,20 @@ private async void SaveCommand()
       try
       {
         _stream.Stream = await _stream.StreamState.Client.StreamGet(_stream.StreamState.StreamId);
+        var pc = await _stream.StreamState.Client.StreamGetPendingCollaborators(_stream.StreamState.StreamId);
+        _stream.Stream.pendingCollaborators = pc.pendingCollaborators;
         _stream.StreamState.CachedStream = _stream.Stream;
 
+        ReloadUsers();
       }
       catch (Exception e)
       {
       }
 
-      MainViewModel.RouterInstance.NavigateBack.Execute();
+      if (IsDialog)
+        MainViewModel.RouterInstance.NavigateBack.Execute();
+
+      this.RaisePropertyChanged(nameof(AddedUsers));
     }
 
     private async void CloseCommand()
@@ -295,7 +396,8 @@ private void RemoveSeletedUsersCommand()
       }
 
       this.RaisePropertyChanged("HasSelectedUsers");
-      this.RaisePropertyChanged("HasAddedUsers");
+      this.RaisePropertyChanged(nameof(AddedUsers));
+
     }
 
     private async void ChangeRoleSeletedUsersCommand()
@@ -311,6 +413,7 @@ private async void ChangeRoleSeletedUsersCommand()
         }
       }
 
+      this.RaisePropertyChanged(nameof(AddedUsers));
     }
   }
 }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/CommentViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/CommentViewModel.cs
index 293c866c7a..3d895f0a23 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/CommentViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/CommentViewModel.cs
@@ -1,6 +1,8 @@
-using ReactiveUI;
+using DesktopUI2.Views;
+using ReactiveUI;
 using Speckle.Core.Api;
 using Speckle.Core.Logging;
+using Splat;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -12,18 +14,14 @@ namespace DesktopUI2.ViewModels
 {
   public class CommentViewModel : ReactiveObject
   {
+    private ConnectorBindings Bindings;
     public CommentItem Comment { get; set; }
     public string StreamId { get; private set; }
     public Task<AccountViewModel> Author => GetAuthorAsync();
     public Task<Avalonia.Media.Imaging.Bitmap> Screenshot => GetScreenshotAsync();
 
-    public string Text
-    {
-      get
-      {
-        return string.Join("", Comment.text.Doc.Content.Select(x => string.Join("", x.Content.Select(x => x.Text).ToList())).ToList());
-      }
-    }
+    //return string.Join("", Comment.text.Doc?.Content.Select(x => string.Join("", x.Content.Select(x => x.Text).ToList())).ToList());
+    public string Text { get; private set; }
 
     private async Task<AccountViewModel> GetAuthorAsync()
     {
@@ -59,6 +57,11 @@ public CommentViewModel(CommentItem item, string streamId, Client client)
       Comment = item;
       StreamId = streamId;
       _client = client;
+      Text = Comment.rawText;
+
+      //use dependency injection to get bindings
+      Bindings = Locator.Current.GetService<ConnectorBindings>();
+
       if (Comment.replies != null)
       {
         foreach (var r in Comment.replies.items)
@@ -69,6 +72,35 @@ public CommentViewModel(CommentItem item, string streamId, Client client)
       }
     }
 
+    public void OpenCommentView()
+    {
+      try
+      {
+        if (Comment.data != null && Comment.data.camPos != null)
+        {
+          Bindings.Open3DView(Comment.data.camPos, Comment.id);
+          Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Comment Open 3D View" } });
+          return;
+        }
+      }
+      catch (Exception ex)
+      {
+
+      }
+
+      //something went wrong
+      Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+      {
+        MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+        {
+          Title = "Could not open view!",
+          Message = "Something went wrong",
+          Type = Avalonia.Controls.Notifications.NotificationType.Error,
+        });
+      });
+
+    }
+
     public void OpenComment()
     {
       if (Comment.resources == null || !Comment.resources.Any())
diff --git a/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignHomeViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignHomeViewModel.cs
index ef14d7cc79..4caadf861e 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignHomeViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignHomeViewModel.cs
@@ -24,7 +24,10 @@ public class DesignHomeViewModel
 
     public List<DesignSavedStreamViewModel> SavedStreams { get; set; }
 
-    public bool HasSavedStreams = true;
+    public bool HasSavedStreams { get; set; } = true;
+
+    public string Title { get; set; } = "for Desktop UI 3D Max";
+    public string Version { get; set; } = "1.2.3-beta8";
 
     public DesignHomeViewModel()
     {
diff --git a/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignNotificationsViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignNotificationsViewModel.cs
new file mode 100644
index 0000000000..ebd27429bc
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignNotificationsViewModel.cs
@@ -0,0 +1,24 @@
+using Speckle.Core.Credentials;
+using System.Collections.Generic;
+
+namespace DesktopUI2.ViewModels.DesignViewModels
+{
+  public class DesignNotificationsViewModel
+  {
+
+    public List<NotificationViewModel> Notifications { get; set; } = new List<NotificationViewModel>();
+
+
+    public DesignNotificationsViewModel()
+    {
+      Notifications.Add(new NotificationViewModel { Message = "Pinco Pallimno wants to add you to 'This is a Sample stream!'" });
+      Notifications.Add(new NotificationViewModel { Message = "Carlo wants to add you to 'This is a Sample stream!'" });
+      Notifications.Add(new NotificationViewModel { Message = "Pinco Pallimno wants to add you to 'This is a Sample stream!'" });
+
+    }
+
+
+  }
+
+
+}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignSavedStreamsViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignSavedStreamsViewModel.cs
index 947660ea1b..d3fe3b3f57 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignSavedStreamsViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignSavedStreamsViewModel.cs
@@ -80,16 +80,16 @@ public DesignSavedStreamViewModel()
         Filter = new ListSelectionFilter { Icon = "Mouse", Name = "Category" }
       };
 
-      Activity = new List<ActivityViewModel>() {
-        new ActivityViewModel (null, null){
-
-          Margin = new Avalonia.Thickness(50,10,10,0),
-          Icon = "ArrowBottomLeft",
-          Message = "Commit 5aaf00a723 was received by Matteo Cominetti" },
-        new ActivityViewModel (null, null) {
-              Margin = new Avalonia.Thickness(10,10,50,0),
-          Icon = "ArrowTopRight",
-          Message = "Commit created on branch main: 0ae5a01ad7 (Sent 148 objects from Revit2022.)" } };
+      //Activity = new List<ActivityViewModel>() {
+      //  new ActivityViewModel (new Speckle.Core.Api.ActivityItem{ actionType="commit_create",time=""}, null){
+
+      //    Margin = new Avalonia.Thickness(50,10,10,0),
+      //    Icon = "ArrowBottomLeft",
+      //    Message = "Commit 5aaf00a723 was received by Matteo Cominetti" },
+      //  new ActivityViewModel (new Speckle.Core.Api.ActivityItem{ actionType="commit_receive", time=""}, null) {
+      //        Margin = new Avalonia.Thickness(10,10,50,0),
+      //    Icon = "ArrowTopRight",
+      //    Message = "Commit created on branch main: 0ae5a01ad7 (Sent 148 objects from Revit2022.)" } };
     }
 
     public void ReceiveCommand()
@@ -107,10 +107,6 @@ public void CancelSendOrReceiveCommand()
 
     }
 
-    public void CloseNotificationCommand()
-    {
-
-    }
 
     public void OpenReportCommand()
     {
diff --git a/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs
index 9128dd350f..47de152df7 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs
@@ -1,9 +1,15 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Metadata;
+using Avalonia.Threading;
 using DesktopUI2.Models;
+using DesktopUI2.Views;
 using DesktopUI2.Views.Windows.Dialogs;
+using Material.Icons;
+using Material.Icons.Avalonia;
 using Material.Styles.Themes;
 using Material.Styles.Themes.Base;
 using ReactiveUI;
@@ -59,19 +65,16 @@ public bool InProgress
       private set => this.RaiseAndSetIfChanged(ref _showProgress, value);
     }
 
-    private bool _isLoggingIn;
-    public bool IsLoggingIn
-    {
-      get => _isLoggingIn;
-      private set => this.RaiseAndSetIfChanged(ref _isLoggingIn, value);
-    }
 
 
-    private bool _hasUpdate;
-    public bool HasUpdate
+    private ObservableCollection<MenuItemViewModel> _menuItems = new ObservableCollection<MenuItemViewModel>();
+    public ObservableCollection<MenuItemViewModel> MenuItems
     {
-      get => _hasUpdate;
-      private set => this.RaiseAndSetIfChanged(ref _hasUpdate, value);
+      get => _menuItems;
+      private set
+      {
+        this.RaiseAndSetIfChanged(ref _menuItems, value);
+      }
     }
 
     private List<StreamAccountWrapper> _streams;
@@ -86,6 +89,14 @@ private set
       }
     }
 
+    private ObservableCollection<NotificationViewModel> _notifications = new ObservableCollection<NotificationViewModel>();
+    public ObservableCollection<NotificationViewModel> Notifications
+    {
+      get => _notifications;
+      private set => this.RaiseAndSetIfChanged(ref _notifications, value);
+
+    }
+
     private Filter _selectedFilter = Filter.all;
     public Filter SelectedFilter
     {
@@ -169,8 +180,8 @@ public string SearchQuery
 
 
     private StreamViewModel _selectedSavedStream = null;
-    private ObservableCollection<StreamViewModel> _savedStreams = new ObservableCollection<StreamViewModel>();
-    public ObservableCollection<StreamViewModel> SavedStreams
+    private List<StreamViewModel> _savedStreams = new List<StreamViewModel>();
+    public List<StreamViewModel> SavedStreams
     {
       get => _savedStreams;
       set
@@ -187,31 +198,23 @@ public List<AccountViewModel> Accounts
       private set
       {
         this.RaiseAndSetIfChanged(ref _accounts, value);
-        this.RaisePropertyChanged("HasOneAccount");
-        this.RaisePropertyChanged("HasMultipleAccounts");
         this.RaisePropertyChanged("HasAccounts");
         this.RaisePropertyChanged("Avatar");
       }
     }
 
-    public Bitmap Avatar
-    {
-      get => HasAccounts ? Accounts[0].AvatarImage : null;
-    }
-
-    public bool HasOneAccount
+    public bool HasAccounts
     {
-      get => Accounts.Count == 1;
+      get => Accounts != null && Accounts.Any();
     }
 
-    public bool HasMultipleAccounts
-    {
-      get => Accounts.Count > 1;
-    }
+    private List<Client> _subscribedClientsStreamAddRemove = new List<Client>();
 
-    public bool HasAccounts
+    private bool _isOffline = false;
+    public bool IsOffline
     {
-      get => Accounts != null && Accounts.Any();
+      get => _isOffline;
+      private set => this.RaiseAndSetIfChanged(ref _isOffline, value);
     }
 
     #endregion
@@ -224,15 +227,14 @@ public HomeViewModel(IScreen screen)
         HostScreen = screen;
         RemoveSavedStreamCommand = ReactiveCommand.Create<string>(RemoveSavedStream);
 
-        SavedStreams.CollectionChanged += SavedStreams_CollectionChanged;
-
         Bindings = Locator.Current.GetService<ConnectorBindings>();
-        this.RaisePropertyChanged("SavedStreams");
-        streamSearchDebouncer = Utils.Debounce(SearchStreams, 500);
-        Init();
 
-        var config = ConfigManager.Load();
-        ChangeTheme(config.DarkTheme);
+        Bindings.UpdateSavedStreams = UpdateSavedStreams;
+        Bindings.UpdateSelectedStream = UpdateSelectedStream;
+
+
+
+        streamSearchDebouncer = Utils.Debounce(SearchStreams, 500);
       }
       catch (Exception ex)
       {
@@ -248,11 +250,16 @@ internal void UpdateSavedStreams(List<StreamState> streams)
     {
       try
       {
-        SavedStreams.CollectionChanged -= SavedStreams_CollectionChanged;
-        SavedStreams = new ObservableCollection<StreamViewModel>();
-        streams.ForEach(x => SavedStreams.Add(new StreamViewModel(x, HostScreen, RemoveSavedStreamCommand)));
+        ClearSavedStreams();
+
+        foreach (StreamState stream in streams)
+        {
+          SavedStreams.Add(new StreamViewModel(stream, HostScreen, RemoveSavedStreamCommand));
+        }
+
+        this.RaisePropertyChanged("SavedStreams");
         this.RaisePropertyChanged("HasSavedStreams");
-        SavedStreams.CollectionChanged += SavedStreams_CollectionChanged;
+
 
         Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Saved Streams Load" }, { "count", streams.Count } });
       }
@@ -262,6 +269,16 @@ internal void UpdateSavedStreams(List<StreamState> streams)
       }
     }
 
+    private void ClearSavedStreams()
+    {
+      //dispose subscriptions!
+      SavedStreams.ForEach(x => x.Dispose());
+      SavedStreams.Clear();
+    }
+
+    /// <summary>
+    /// Binding from host app when the saved stream needs to refresh filters & such
+    /// </summary>
     internal void UpdateSelectedStream()
     {
       try
@@ -275,13 +292,6 @@ internal void UpdateSelectedStream()
       }
     }
 
-    //write changes to file every time they happen
-    //this is because if there is an active document change we need to swap saved streams and restore them later
-    //even if the doc has not been saved
-    private void SavedStreams_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-    {
-      WriteStreamsToFile();
-    }
 
     internal void WriteStreamsToFile()
     {
@@ -297,16 +307,14 @@ internal void AddSavedStream(StreamViewModel stream)
         if (savedStream != null)
         {
           savedStream = stream;
-          WriteStreamsToFile();
         }
         //it's a new saved stream
         else
         {
-          //triggers => SavedStreams_CollectionChanged
           SavedStreams.Add(stream);
-
         }
 
+        WriteStreamsToFile();
         this.RaisePropertyChanged("HasSavedStreams");
       }
       catch (Exception ex)
@@ -315,6 +323,7 @@ internal void AddSavedStream(StreamViewModel stream)
       }
     }
 
+
     private async Task GetStreams()
     {
       try
@@ -323,6 +332,8 @@ private async Task GetStreams()
           return;
 
         InProgress = true;
+
+        //needed for the search feature
         StreamGetCancelTokenSource?.Cancel();
         StreamGetCancelTokenSource = new CancellationTokenSource();
 
@@ -335,7 +346,6 @@ private async Task GetStreams()
 
           try
           {
-            var client = new Client(account.Account);
             var result = new List<Stream>();
 
             //NO SEARCH
@@ -343,9 +353,9 @@ private async Task GetStreams()
             {
 
               if (SelectedFilter == Filter.favorite)
-                result = await client.FavoriteStreamsGet(StreamGetCancelTokenSource.Token, 25);
+                result = await account.Client.FavoriteStreamsGet(StreamGetCancelTokenSource.Token, 25);
               else
-                result = await client.StreamsGet(StreamGetCancelTokenSource.Token, 25);
+                result = await account.Client.StreamsGet(StreamGetCancelTokenSource.Token, 25);
             }
             //SEARCH
             else
@@ -353,7 +363,7 @@ private async Task GetStreams()
               //do not search favorite streams, too much hassle
               if (SelectedFilter == Filter.favorite)
                 SelectedFilter = Filter.all;
-              result = await client.StreamSearch(StreamGetCancelTokenSource.Token, SearchQuery, 25);
+              result = await account.Client.StreamSearch(StreamGetCancelTokenSource.Token, SearchQuery, 25);
             }
 
             if (StreamGetCancelTokenSource.IsCancellationRequested)
@@ -367,8 +377,14 @@ private async Task GetStreams()
             if (e.InnerException is System.Threading.Tasks.TaskCanceledException)
               return;
             Log.CaptureException(new Exception("Could not fetch streams", e), Sentry.SentryLevel.Error);
-            //NOTE: the line below crashes revit at startup! We need to investigate more
-            //Dialogs.ShowDialog($"Could not get streams", $"With account {account.Account.userInfo.email} on server {account.Account.serverInfo.url}\n\n" + e.Message, Material.Dialog.Icons.DialogIconKind.Error);
+            Dispatcher.UIThread.Post(() =>
+              MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+              {
+                Title = "⚠️ Could not get streams",
+                Message = $"With account {account.Account.userInfo.email} on server {account.Account.serverInfo.url}\n\n",
+                Type = Avalonia.Controls.Notifications.NotificationType.Error
+              }), DispatcherPriority.Background);
+
           }
         }
         if (StreamGetCancelTokenSource.IsCancellationRequested)
@@ -376,27 +392,104 @@ private async Task GetStreams()
 
         Streams = streams.OrderByDescending(x => DateTime.Parse(x.Stream.updatedAt)).ToList();
 
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+      }
+      finally
+      {
         InProgress = false;
       }
+    }
+
+    private async Task GetNotifications()
+    {
+      try
+      {
+
+        var hasUpdate = await Helpers.IsConnectorUpdateAvailable(Bindings.GetHostAppName()).ConfigureAwait(false);
+
+        Notifications.Clear();
+
+        if (hasUpdate)
+          Notifications.Add(new NotificationViewModel { Message = "An update for this connector is available, install it now!", Launch = LaunchManagerCommand, Icon = MaterialIconKind.Gift, IconColor = Avalonia.Media.Brushes.Gold });
+
+        foreach (var account in Accounts)
+        {
+          try
+          {
+            var result = await account.Client.GetAllPendingInvites();
+            foreach (var r in result)
+            {
+              Notifications.Add(new NotificationViewModel(r, account.Client.ServerUrl));
+            }
+
+          }
+          catch (Exception e)
+          {
+            if (e.InnerException is System.Threading.Tasks.TaskCanceledException)
+              return;
+            Log.CaptureException(new Exception("Could not fetch invites", e), Sentry.SentryLevel.Error);
+          }
+        }
+
+
+        this.RaisePropertyChanged(nameof(Notifications));
+
+      }
       catch (Exception ex)
       {
         Log.CaptureException(ex, Sentry.SentryLevel.Error);
       }
     }
 
-    private void SearchStreams()
+    private async void SearchStreams()
     {
+      if (await CheckIsOffline())
+        return;
+
       GetStreams().ConfigureAwait(false);
       this.RaisePropertyChanged("StreamsText");
     }
 
-    internal async void Init()
+    private async Task<bool> CheckIsOffline()
+    {
+      if (!await Helpers.UserHasInternet())
+      {
+        Dispatcher.UIThread.Post(() =>
+          MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+          {
+            Title = "⚠️ Oh no!",
+            Message = "Could not reach the internet, are you connected?",
+            Type = Avalonia.Controls.Notifications.NotificationType.Error
+          }), DispatcherPriority.Background);
+
+        IsOffline = true;
+      }
+      else
+        IsOffline = false;
+
+      return IsOffline;
+
+    }
+
+    internal async void Refresh()
     {
       try
       {
+        if (await CheckIsOffline())
+          return;
+
+        //prevent subscriptions from being registered multiple times
+        _subscribedClientsStreamAddRemove.ForEach(x => x.Dispose());
+        _subscribedClientsStreamAddRemove.Clear();
+
         Accounts = AccountManager.GetAccounts().Select(x => new AccountViewModel(x)).ToList();
 
         GetStreams();
+        GetNotifications();
+        GenerateMenuItems();
 
         try
         {
@@ -406,28 +499,19 @@ internal async void Init()
         }
         catch { }
 
+        foreach (var account in Accounts)
+        {
 
-        HasUpdate = await Helpers.IsConnectorUpdateAvailable(Bindings.GetHostAppName()).ConfigureAwait(false);
-      }
-      catch (Exception ex)
-      {
-        Log.CaptureException(ex, Sentry.SentryLevel.Error);
-      }
-    }
+          account.Client.SubscribeUserStreamAdded();
+          account.Client.OnUserStreamAdded += Client_OnUserStreamAdded;
+
+          account.Client.SubscribeUserStreamRemoved();
+          account.Client.OnUserStreamRemoved += Client_OnUserStreamRemoved;
+
+          _subscribedClientsStreamAddRemove.Add(account.Client);
 
-    private void RemoveSavedStream(string id)
-    {
-      try
-      {
-        var s = SavedStreams.FirstOrDefault(x => x.StreamState.Id == id);
-        if (s != null)
-        {
-          SavedStreams.Remove(s);
-          if (s.StreamState.Client != null)
-            Analytics.TrackEvent(s.StreamState.Client.Account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Stream Remove" } });
         }
 
-        this.RaisePropertyChanged("HasSavedStreams");
       }
       catch (Exception ex)
       {
@@ -435,91 +519,136 @@ private void RemoveSavedStream(string id)
       }
     }
 
-    public async void RemoveAccountCommand(Account account)
+    private void Client_OnUserStreamAdded(object sender, Speckle.Core.Api.SubscriptionModels.StreamInfo e)
     {
-      try
+      Avalonia.Threading.Dispatcher.UIThread.Post(() =>
       {
-        AccountManager.RemoveAccount(account.id);
-        Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Account Remove" } });
-        Init();
-      }
-      catch (Exception ex)
-      {
-        Log.CaptureException(ex, Sentry.SentryLevel.Error);
-      }
+        MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+        {
+          Title = "🥳 You have a new Stream!",
+          Message = e.sharedBy == null ? $"You have created '{e.name}'." : $"'{e.name}' has been shared with you.",
+        }); ;
+      });
     }
 
-    public void OpenProfileCommand(Account account)
+    private void Client_OnUserStreamRemoved(object sender, Speckle.Core.Api.SubscriptionModels.StreamInfo e)
     {
-      Process.Start(new ProcessStartInfo($"{account.serverInfo.url}/profile") { UseShellExecute = true });
-      Analytics.TrackEvent(account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Account View" } });
+      Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+      {
+        var streamName = Streams.FirstOrDefault(x => x.Stream.id == e.id)?.Stream?.name;
+        if (streamName == null)
+          streamName = SavedStreams.FirstOrDefault(x => x.Stream.id == e.id)?.Stream?.name;
+        if (streamName == null)
+          return;
+
+        var svm = MainViewModel.RouterInstance.NavigationStack.Last() as StreamViewModel;
+        if (svm != null && svm.Stream.id == e.id)
+          MainViewModel.GoHome();
+
+        //remove all saved streams matching this id
+        foreach (var stateId in SavedStreams.Where(x => x.Stream.id == e.id).Select(y => y.StreamState.Id).ToList())
+          RemoveSavedStream(stateId);
+
+        GetStreams().ConfigureAwait(false);
+
+
+        MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+        {
+          Title = "❌ Stream removed!",
+          Message = $"'{streamName}' has been deleted or un-shared.",
+        }); ;
+      });
     }
 
-    public void LaunchManagerCommand()
+    private void GenerateMenuItems()
     {
       try
       {
-        string path = "";
+        MenuItems.Clear();
+        MenuItemViewModel menu;
 
-        Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Launch Manager" } });
 
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-        {
-          path = @"/Applications/SpeckleManager.app";
-        }
+        if (Accounts.Count > 1)
+          menu = new MenuItemViewModel { Header = new MaterialIcon { Kind = MaterialIconKind.AccountMultiple, Foreground = Avalonia.Media.Brushes.White } };
+        else if (Accounts.Count == 1)
+          menu = new MenuItemViewModel { Header = new Image { Width = 28, Height = 28, [!Image.SourceProperty] = new Binding("AvatarImage"), DataContext = Accounts[0], Clip = new EllipseGeometry(new Rect(0, 0, 28, 28)) }, };
+        else
+          menu = new MenuItemViewModel { Header = new MaterialIcon { Kind = MaterialIconKind.AccountWarning, Foreground = Avalonia.Media.Brushes.White } };
 
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-          path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Speckle", "Manager", "Manager.exe");
-        }
+        menu.Items = new List<MenuItemViewModel>();
 
-        if (File.Exists(path))
-          Process.Start(path);
 
-        else
+
+        foreach (var account in Accounts)
         {
-          Process.Start(new ProcessStartInfo($"https://releases.speckle.systems/") { UseShellExecute = true });
+
+          menu.Items.Add(new MenuItemViewModel
+          {
+            Header = account.FullAccountName,
+            //needs a binding to the image as it's lazy loaded
+            Icon = new Image { Width = 20, Height = 20, [!Image.SourceProperty] = new Binding("AvatarImage"), DataContext = account, Clip = new EllipseGeometry(new Rect(0, 0, 20, 20)) },
+            Items = new List<MenuItemViewModel>()
+            {
+              new MenuItemViewModel(OpenProfileCommand, account.Account, "View online", MaterialIconKind.ExternalLink),
+              new MenuItemViewModel(RemoveAccountCommand, account.Account, "Remove account", MaterialIconKind.AccountMinus)
+            }
+          });
         }
+
+        menu.Items.Add(new MenuItemViewModel(AddAccountCommand, "Add another account", MaterialIconKind.AccountPlus));
+        menu.Items.Add(new MenuItemViewModel(LaunchManagerCommand, "Manage accounts in Manager", MaterialIconKind.AccountCog));
+
+        menu.Items.Add(new MenuItemViewModel(RefreshCommand, "Refresh streams & accounts", MaterialIconKind.Refresh));
+        menu.Items.Add(new MenuItemViewModel(ToggleDarkThemeCommand, "Toggle dark/light theme", MaterialIconKind.SunMoonStars));
+
+#if DEBUG
+        menu.Items.Add(new MenuItemViewModel(TestCommand, "Test stuff", MaterialIconKind.Bomb));
+#endif
+
+        MenuItems.Add(menu);
+
+        this.RaisePropertyChanged("MenuItems");
       }
       catch (Exception ex)
       {
-        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+        new SpeckleException("Error generating menu items", ex, true, Sentry.SentryLevel.Error);
       }
     }
-    public async void AddAccountCommand()
+
+    private void RemoveSavedStream(string stateId)
     {
       try
       {
-        IsLoggingIn = true;
-
+        var i = SavedStreams.FindIndex(x => x.StreamState.Id == stateId);
+        if (i == -1)
+          return;
+        SavedStreams[i].Dispose();
+        SavedStreams.RemoveAt(i);
 
-        var dialog = new AddAccountDialog(AccountManager.GetDefaultServerUrl());
-        var result = await dialog.ShowDialog<string>();
+        WriteStreamsToFile();
 
-        if (result != null)
-        {
-          Uri u;
-          if (!Uri.TryCreate(result, UriKind.Absolute, out u))
-            Dialogs.ShowDialog("Error", "Invalid URL", Material.Dialog.Icons.DialogIconKind.Error);
-          else
-          {
-            try
-            {
-              Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Account Add" } });
+        this.RaisePropertyChanged("SavedStreams");
+        this.RaisePropertyChanged("HasSavedStreams");
 
-              await AccountManager.AddAccount(result);
-              await Task.Delay(1000);
-              Init();
-            }
-            catch (Exception e)
-            {
-              Log.CaptureException(e, Sentry.SentryLevel.Error);
-              Dialogs.ShowDialog("Something went wrong...", e.Message, Material.Dialog.Icons.DialogIconKind.Error);
-            }
-          }
-        }
+        Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Stream Remove" } });
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+      }
+    }
 
-        IsLoggingIn = false;
+    public async void AddAccountCommand()
+    {
+      await Utils.AddAccountCommand();
+    }
+    public async void RemoveAccountCommand(Account account)
+    {
+      try
+      {
+        AccountManager.RemoveAccount(account.id);
+        Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Account Remove" } });
+        MainViewModel.Instance.NavigateToDefaultScreen();
       }
       catch (Exception ex)
       {
@@ -527,6 +656,17 @@ public async void AddAccountCommand()
       }
     }
 
+    public void OpenProfileCommand(Account account)
+    {
+      Process.Start(new ProcessStartInfo($"{account.serverInfo.url}/profile") { UseShellExecute = true });
+      Analytics.TrackEvent(account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Account View" } });
+    }
+
+    public void LaunchManagerCommand()
+    {
+      Utils.LaunchManager();
+    }
+
     public void ClearSearchCommand()
     {
       SearchQuery = "";
@@ -654,8 +794,11 @@ public bool CanAddFromUrlCommand(object parameter)
 
 
 
-    private void OpenStreamCommand(object streamAccountWrapper)
+    private async void OpenStreamCommand(object streamAccountWrapper)
     {
+      if (await CheckIsOffline())
+        return;
+
       if (streamAccountWrapper != null)
       {
         var streamState = new StreamState(streamAccountWrapper as StreamAccountWrapper);
@@ -665,8 +808,11 @@ private void OpenStreamCommand(object streamAccountWrapper)
     }
 
 
-    private void OpenSavedStreamCommand(object streamViewModel)
+    private async void OpenSavedStreamCommand(object streamViewModel)
     {
+      if (await CheckIsOffline())
+        return;
+
       if (streamViewModel != null && streamViewModel is StreamViewModel svm && !svm.NoAccess)
       {
         try
@@ -678,7 +824,7 @@ private void OpenSavedStreamCommand(object streamViewModel)
         }
         catch (Exception ex)
         {
-
+          Log.CaptureException(ex, Sentry.SentryLevel.Error);
         }
       }
     }
@@ -689,44 +835,51 @@ public void ToggleDarkThemeCommand()
       var materialTheme = Application.Current.LocateMaterialTheme<MaterialThemeBase>();
       var isDark = materialTheme.CurrentTheme.GetBaseTheme() == BaseThemeMode.Dark;
 
-      ChangeTheme(isDark);
+      MainViewModel.Instance.ChangeTheme(isDark);
 
       var config = ConfigManager.Load();
       config.DarkTheme = isDark;
       ConfigManager.Save(config);
     }
 
-    private void ChangeTheme(bool isDark)
-    {
 
-      if (Application.Current == null)
-        return;
 
-      var materialTheme = Application.Current.LocateMaterialTheme<MaterialThemeBase>();
-      var theme = materialTheme.CurrentTheme;
+    public void RefreshCommand()
+    {
+      Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Refresh" } });
+      ApiUtils.ClearCache();
+      Refresh();
+    }
 
-      if (isDark)
-        theme.SetBaseTheme(Theme.Light);
-      else
-        theme.SetBaseTheme(Theme.Dark);
+    private void OneClickModeCommand()
+    {
+      var config = ConfigManager.Load();
+      config.OneClickMode = true;
+      ConfigManager.Save(config);
 
-      materialTheme.CurrentTheme = theme;
+      MainViewModel.Instance.NavigateToDefaultScreen();
     }
 
-    public void RefreshCommand()
+    private void NotificationsCommand()
     {
-      Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Refresh" } });
-      ApiUtils.ClearCache();
-      Init();
+      MainViewModel.RouterInstance.Navigate.Execute(new NotificationsViewModel(HostScreen, Notifications.ToList()));
     }
 
     public void TestCommand()
     {
-      var dialog = new ImportExportAlert();
-      dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-      dialog.Show();
-      dialog.Activate();
-      dialog.Focus();
+      MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+      {
+        Title = "🥳 Account removed",
+        Message = $"The account has been removed from all your Connectors!",
+        Expiration = TimeSpan.Zero,
+        Type = Avalonia.Controls.Notifications.NotificationType.Error
+      });
+
+      //var dialog = new ImportExportAlert();
+      //dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+      //dialog.Show();
+      //dialog.Activate();
+      //dialog.Focus();
 
     }
   }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/LogInViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/LogInViewModel.cs
new file mode 100644
index 0000000000..073bbb1fa2
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/ViewModels/LogInViewModel.cs
@@ -0,0 +1,70 @@
+using DesktopUI2.Views;
+using DesktopUI2.Views.Windows.Dialogs;
+using ReactiveUI;
+using Speckle.Core.Credentials;
+using Speckle.Core.Logging;
+using Splat;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopUI2.ViewModels
+{
+  public class LogInViewModel : ReactiveObject, IRoutableViewModel
+  {
+    public string UrlPathSegment => "login";
+
+    public IScreen HostScreen { get; }
+
+    public ConnectorBindings Bindings { get; private set; } = new DummyBindings();
+
+
+    #region bindings
+
+    public string Title => "for " + Bindings.GetHostAppNameVersion();
+    public string Version => "v" + Bindings.ConnectorVersion;
+
+    private bool _isLoggingIn;
+    public bool IsLoggingIn
+    {
+      get => _isLoggingIn;
+      private set => this.RaiseAndSetIfChanged(ref _isLoggingIn, value);
+    }
+
+    public async void AddAccountCommand()
+    {
+      IsLoggingIn = true;
+      await Utils.AddAccountCommand();
+      IsLoggingIn = false;
+    }
+
+    public void LaunchManagerCommand()
+    {
+      Utils.LaunchManager();
+    }
+
+    public void RefreshCommand()
+    {
+      MainViewModel.Instance.NavigateToDefaultScreen();
+    }
+
+    #endregion
+
+    public LogInViewModel(IScreen screen)
+    {
+      try
+      {
+        HostScreen = screen;
+        Bindings = Locator.Current.GetService<ConnectorBindings>();
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+      }
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/MainViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/MainViewModel.cs
index 3ac4513163..6f6eac6bb9 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/MainViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/MainViewModel.cs
@@ -1,12 +1,14 @@
-using Avalonia.Controls;
-using DesktopUI2.ViewModels.Share;
+using Avalonia;
+using Avalonia.Controls;
+using DesktopUI2.Models;
 using DesktopUI2.Views.Pages;
-using DesktopUI2.Views.Pages.ShareControls;
-using DesktopUI2.Views.Windows.Dialogs;
+using Material.Styles.Themes;
 using ReactiveUI;
+using Speckle.Core.Credentials;
 using Speckle.Core.Logging;
 using Splat;
 using System;
+using System.Linq;
 using System.Reactive;
 
 namespace DesktopUI2.ViewModels
@@ -24,6 +26,8 @@ public class MainViewModel : ViewModelBase, IScreen
 
     internal static MainViewModel Instance { get; private set; }
 
+    public static HomeViewModel Home { get; private set; }
+
     public bool DialogVisible
     {
       get => _dialogBody != null;
@@ -72,17 +76,40 @@ private void Init()
 
       Locator.CurrentMutable.Register(() => new StreamEditView(), typeof(IViewFor<StreamViewModel>));
       Locator.CurrentMutable.Register(() => new HomeView(), typeof(IViewFor<HomeViewModel>));
+      Locator.CurrentMutable.Register(() => new OneClickView(), typeof(IViewFor<OneClickViewModel>));
       Locator.CurrentMutable.Register(() => new CollaboratorsView(), typeof(IViewFor<CollaboratorsViewModel>));
       Locator.CurrentMutable.Register(() => new SettingsView(), typeof(IViewFor<SettingsPageViewModel>));
+      Locator.CurrentMutable.Register(() => new NotificationsView(), typeof(IViewFor<NotificationsViewModel>));
+      Locator.CurrentMutable.Register(() => new LogInView(), typeof(IViewFor<LogInViewModel>));
       Locator.CurrentMutable.Register(() => Bindings, typeof(ConnectorBindings));
 
       RouterInstance = Router; // makes the router available app-wide
-      Router.Navigate.Execute(new HomeViewModel(this));
 
-      Bindings.UpdateSavedStreams = HomeViewModel.Instance.UpdateSavedStreams;
-      Bindings.UpdateSelectedStream = HomeViewModel.Instance.UpdateSelectedStream;
+      var config = ConfigManager.Load();
+      ChangeTheme(config.DarkTheme);
+
+      //reusing the same view model not to lose its state
+      Home = new HomeViewModel(this);
+      NavigateToDefaultScreen();
+    }
 
+    internal void NavigateToDefaultScreen()
+    {
+      var config = ConfigManager.Load();
 
+      if (!AccountManager.GetAccounts().Any())
+      {
+        Router.Navigate.Execute(new LogInViewModel(this));
+      }
+      else if (config.OneClickMode)
+      {
+        Router.Navigate.Execute(new OneClickViewModel(this));
+      }
+      else
+      {
+        Home.Refresh();
+        Router.Navigate.Execute(Home);
+      }
     }
 
     //https://github.com/AvaloniaUI/Avalonia/issues/5290
@@ -94,13 +121,38 @@ private void CatchReactiveException(Exception e)
 
     public static void GoHome()
     {
-      if (RouterInstance != null && HomeViewModel.Instance != null)
-        RouterInstance.Navigate.Execute(HomeViewModel.Instance);
+      if (RouterInstance == null)
+        return;
+
+      var config = ConfigManager.Load();
+      if (!config.OneClickMode)
+      {
+        RouterInstance.Navigate.Execute(Home);
+      }
     }
 
     public static void CloseDialog()
     {
       Instance.DialogBody = null;
     }
+
+    internal void ChangeTheme(bool isDark)
+    {
+
+      if (Application.Current == null)
+        return;
+
+      var materialTheme = Application.Current.LocateMaterialTheme<MaterialThemeBase>();
+      var theme = materialTheme.CurrentTheme;
+
+      if (isDark)
+        theme.SetBaseTheme(Theme.Light);
+      else
+        theme.SetBaseTheme(Theme.Dark);
+
+      materialTheme.CurrentTheme = theme;
+    }
+
+
   }
 }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/MappingTool/MappingsViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/MappingTool/MappingsViewModel.cs
new file mode 100644
index 0000000000..a7c01d1fa0
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/ViewModels/MappingTool/MappingsViewModel.cs
@@ -0,0 +1,384 @@
+using Avalonia.Metadata;
+using DesktopUI2.Models;
+using Objects.BuiltElements.Revit;
+using ReactiveUI;
+using Speckle.Core.Api;
+using Speckle.Core.Kits;
+using Speckle.Core.Logging;
+using Speckle.Core.Models;
+using Speckle.Core.Transports;
+using Speckle.Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopUI2.ViewModels.MappingTool
+{
+  public class MappingsViewModel : ViewModelBase, IScreen
+  {
+    public string TitleFull => "Speckle Mappings";
+    public RoutingState Router { get; private set; }
+
+    public MappingsBindings Bindings { get; private set; } = new DummyMappingsBindings();
+
+    private List<Schema> _schemas = new List<Schema>();
+    public List<Schema> Schemas
+    {
+      get => _schemas;
+      set => this.RaiseAndSetIfChanged(ref _schemas, value);
+
+    }
+
+    private Schema _selectedSchema;
+
+    public Schema SelectedSchema
+    {
+      get => _selectedSchema;
+      set => this.RaiseAndSetIfChanged(ref _selectedSchema, value);
+
+    }
+
+    public List<RevitElementType> AvailableRevitTypes { get; private set; } = new List<RevitElementType>();
+    public List<string> AvailableRevitLevels { get; private set; } = new List<string>();
+
+
+
+    public static RoutingState RouterInstance { get; private set; }
+
+    public ReactiveCommand<Unit, Unit> GoBack => Router.NavigateBack;
+
+    public static MappingsViewModel Instance { get; private set; }
+
+
+
+    private bool _showProgress;
+    public bool ShowProgress
+    {
+      get => _showProgress;
+      private set => this.RaiseAndSetIfChanged(ref _showProgress, value);
+    }
+
+    private int _count;
+    public int Count
+    {
+      get => _count;
+      private set => this.RaiseAndSetIfChanged(ref _count, value);
+    }
+
+    private string _promptMsg = "To get started, select a mapping data source.";
+    public string PromptMsg
+    {
+      get => _promptMsg;
+      private set => this.RaiseAndSetIfChanged(ref _promptMsg, value);
+    }
+
+    private StreamAccountWrapper _selectedStream;
+    public StreamAccountWrapper SelectedStream
+    {
+      get => _selectedStream;
+      private set => this.RaiseAndSetIfChanged(ref _selectedStream, value);
+    }
+
+    private List<SchemaGroup> _existingSchemas;
+    public List<SchemaGroup> ExistingSchemas
+    {
+      get => _existingSchemas;
+      private set => this.RaiseAndSetIfChanged(ref _existingSchemas, value);
+    }
+
+    public StreamSelectorViewModel StreamSelector { get; private set; } = new StreamSelectorViewModel();
+
+    MappingSelectionInfo _lastInfo = null;
+    public MappingsViewModel()
+    {
+      Init();
+    }
+
+    public MappingsViewModel(MappingsBindings bindings)
+    {
+      Bindings = bindings;
+      Init();
+    }
+
+
+    public void Init()
+    {
+      Instance = this;
+      Router = new RoutingState();
+      Bindings.UpdateSelection = UpdateSelection;
+      Bindings.UpdateExistingSchemaElements = UpdateExistingSchemaElements;
+      RouterInstance = Router; // makes the router available app-wide
+
+
+      UpdateSelection(Bindings.GetSelectionInfo());
+      UpdateExistingSchemaElements(Bindings.GetExistingSchemaElements());
+
+    }
+
+    private void UpdateSelection(MappingSelectionInfo info)
+    {
+      _lastInfo = info;
+      Count = info.Count;
+
+      PromptMsg = "";
+
+      //empty selection
+      if (Count == 0)
+      {
+        if (SelectedStream != null)
+          PromptMsg = "Select one or more elements.";
+        else
+          PromptMsg = "To get started, select a mapping data source.";
+
+        SelectedSchema = null;
+        return;
+
+      }
+
+
+      //this might be a bit inefficient
+      AddRevitInfoToSchema(info.Schemas);
+
+      if (Schemas.Any())
+      {
+        if (Schemas.Any(x => x.HasData))
+          SelectedSchema = Schemas.First(x => x.HasData);
+        SelectedSchema = Schemas.First();
+
+        if (SelectedStream == null || !AvailableRevitTypes.Any() || !AvailableRevitLevels.Any())
+          PromptMsg = "Try selecting a compatible mapping source for more options.";
+      }
+      else
+      {
+        if (SelectedStream == null)
+          PromptMsg = "No options available for the current selection, try selecting a mapping data source.";
+        else if (!AvailableRevitTypes.Any())
+          PromptMsg = "The selected branch does not contain any Revit types, try changing mapping data source.";
+        else if (!AvailableRevitLevels.Any())
+          PromptMsg = "The selected branch does not contain any Revit levels, try changing mapping data source.";
+        else
+          PromptMsg = "Incompatible selection, try selecting objects of the same type or changing mapping source";
+
+        SelectedSchema = null;
+        return;
+      }
+
+
+    }
+
+    private void UpdateExistingSchemaElements(List<Schema> schemas)
+    {
+      ExistingSchemas = schemas.GroupBy(x => x.Name).Select(x => new SchemaGroup(x.Key, x.ToList())).ToList();
+    }
+
+    internal async void OnBranchSelected()
+    {
+      try
+      {
+
+        var model = await GetCommit();
+
+        if (model == null)
+          return;
+
+        GetTypesAndLevels(model);
+
+        SelectedStream = StreamSelector.SelectedStream;
+
+        //force an update
+        if (_lastInfo != null)
+          UpdateSelection(_lastInfo);
+
+      }
+      catch (Exception e)
+      {
+
+      }
+      finally
+      {
+        ShowProgress = false;
+      }
+    }
+
+    private async Task<Base> GetCommit()
+    {
+      if (StreamSelector.SelectedBranch == null || StreamSelector.SelectedBranch.commits == null || StreamSelector.SelectedBranch.commits.items.Count == 0)
+        return null;
+
+      ShowProgress = true;
+
+      var client = new Client(StreamSelector.SelectedStream.Account);
+      string referencedObject = StreamSelector.SelectedBranch.commits.items.FirstOrDefault().referencedObject;
+
+      var transport = new ServerTransport(StreamSelector.SelectedStream.Account, StreamSelector.SelectedStream.Stream.id);
+      return await Operations.Receive(
+          referencedObject,
+          transport,
+          disposeTransports: true
+          );
+    }
+
+    private void GetTypesAndLevels(Base model)
+    {
+      var revitTypes = new List<RevitElementType>();
+      try
+      {
+        var types = model["Types"] as Base;
+
+        foreach (var baseCategory in types.GetMembers(DynamicBaseMemberType.Instance | DynamicBaseMemberType.Dynamic))
+        {
+          try
+          {
+            var elementTypes = (baseCategory.Value as List<object>).Cast<RevitElementType>().ToList();
+            if (!elementTypes.Any())
+              continue;
+
+            revitTypes.AddRange(elementTypes);
+
+          }
+          catch (Exception ex)
+          {
+            continue;
+          }
+        }
+        AvailableRevitTypes = revitTypes;
+        AvailableRevitLevels = (model["@Levels"] as List<object>).Cast<RevitLevel>().Select(x => x.name).ToList();
+
+      }
+      catch (Exception ex)
+      {
+        return;
+      }
+
+
+    }
+
+    /// <summary>
+    /// Add Revit information such as families and levels to our schema to populate dropdowns and such
+    /// </summary>
+    /// <param name="schemas">Available schemas for the current selection</param>
+    private void AddRevitInfoToSchema(List<Schema> schemas)
+    {
+      var updatedSchemas = new List<Schema>();
+
+      foreach (var schema in schemas)
+      {
+        switch (schema)
+        {
+          case RevitWallViewModel o:
+            var wallFamilies = AvailableRevitTypes.Where(x => x.category == "Walls").ToList();
+            if (!wallFamilies.Any() || !AvailableRevitLevels.Any())
+              break;
+            var wallFamiliesViewModels = wallFamilies.GroupBy(x => x.family).Select(g => new RevitFamily(g.Key.ToString(), g.Select(y => y.type).ToList())).ToList();
+            o.Families = wallFamiliesViewModels;
+            o.Levels = AvailableRevitLevels;
+            updatedSchemas.Add(o);
+            break;
+
+          case RevitBeamViewModel o:
+            var beamFamilies = AvailableRevitTypes.Where(x => x.category == "Structural Framing").ToList();
+            if (!beamFamilies.Any() || !AvailableRevitLevels.Any())
+              break;
+            var beamFamiliesViewModels = beamFamilies.GroupBy(x => x.family).Select(g => new RevitFamily(g.Key.ToString(), g.Select(y => y.type).ToList())).ToList();
+            o.Families = beamFamiliesViewModels;
+            o.Levels = AvailableRevitLevels;
+            updatedSchemas.Add(o);
+            break;
+
+          case RevitBraceViewModel o:
+            var braceFamilies = AvailableRevitTypes.Where(x => x.category == "Structural Framing").ToList();
+            if (!braceFamilies.Any() || !AvailableRevitLevels.Any())
+              break;
+            var braceFamiliesViewModels = braceFamilies.GroupBy(x => x.family).Select(g => new RevitFamily(g.Key.ToString(), g.Select(y => y.type).ToList())).ToList();
+            o.Families = braceFamiliesViewModels;
+            o.Levels = AvailableRevitLevels;
+            updatedSchemas.Add(o);
+            break;
+
+          case RevitFamilyInstanceViewModel o:
+            var fiFamilies = AvailableRevitTypes.Where(x => x.placementType == "OneLevelBased").ToList();
+            if (!fiFamilies.Any() || !AvailableRevitLevels.Any())
+              break;
+            var fiFamiliesViewModels = fiFamilies.GroupBy(x => x.family).Select(g => new RevitFamily(g.Key.ToString(), g.Select(y => y.type).ToList())).ToList();
+            o.Families = fiFamiliesViewModels;
+            o.Levels = AvailableRevitLevels;
+            updatedSchemas.Add(o);
+            break;
+
+          case DirectShapeFreeformViewModel o:
+            updatedSchemas.Add(o);
+            break;
+        }
+      }
+
+
+      //var revitMetadata = new List<RevitMetadataViewModel>();
+
+      ////ADAPTIVE COMPONENT
+      //var adaptiveFamilies = revitTypes.Where(x => x.placementType == "Adaptive").ToList();
+      //if (adaptiveFamilies.Any())
+      //{
+      //  revitMetadata.Add(new RevitMetadataViewModel("Adaptive Component", new List<Type> { typeof(AdaptiveComponent) }, adaptiveFamilies));
+      //}
+
+      //revitMetadata.Add(new RevitMetadataViewModel("Curve", new List<Type> { typeof(DetailCurve), typeof(ModelCurve), typeof(RoomBoundaryLine), typeof(SpaceSeparationLine) }));
+      //revitMetadata.Add(new RevitMetadataViewModel("DirectShape", new List<Type> { typeof(DirectShape) }));
+
+      ////FAMILY INSTANCE
+      //var fiFamilies = revitTypes.Where(x => x.placementType != "Adaptive" && x.placementType != "Invalid").ToList();
+      //if (fiFamilies.Any())
+      //{
+      //  revitMetadata.Add(new RevitMetadataViewModel("Family Instance", new List<Type> { typeof(FamilyInstance) }, fiFamilies));
+      //}
+
+
+      //also triggers binding refresh
+      Schemas = updatedSchemas;
+
+
+    }
+
+    [DependsOn(nameof(SelectedSchema))]
+    public bool CanSetMappingsCommand(object parameter)
+    {
+      if (SelectedSchema == null)
+        return false;
+      //TODO: trigger refresh as any of these changes so we can check if schema is valid
+      //var vals = SelectedSchema.GetType().GetProperties()
+      //                      .Select(p => p.GetValue(SelectedSchema)).ToList();
+      //bool isAnyPropNull = SelectedSchema.GetType().GetProperties()
+      //                      .All(p => p.GetValue(SelectedSchema) != null);
+
+
+      return true;
+    }
+
+    public void SetMappingsCommand()
+    {
+
+      Bindings.SetMappings(SelectedSchema.GetSerializedSchema(), SelectedSchema.GetSerializedViewModel());
+
+      Analytics.TrackEvent(Analytics.Events.MappingsAction, new Dictionary<string, object>() { { "name", "Mappings Set" }, { "schema", SelectedSchema.Name } });
+    }
+
+    public void ClearMappingsCommand()
+    {
+      Bindings.ClearMappings();
+      Analytics.TrackEvent(Analytics.Events.MappingsAction, new Dictionary<string, object>() { { "name", "Mappings Clear" } });
+    }
+
+
+    public void OpenStreamSelectorCommand()
+    {
+      StreamSelector.IsVisible = true;
+    }
+
+  }
+
+
+}
+
diff --git a/DesktopUI2/DesktopUI2/ViewModels/MappingTool/Schemas.cs b/DesktopUI2/DesktopUI2/ViewModels/MappingTool/Schemas.cs
new file mode 100644
index 0000000000..5319aaa2e6
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/ViewModels/MappingTool/Schemas.cs
@@ -0,0 +1,261 @@
+using Objects.BuiltElements.Revit;
+using ReactiveUI;
+using Speckle.Core.Api;
+using Speckle.Core.Models;
+using Speckle.Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace DesktopUI2.ViewModels.MappingTool
+{
+  [DataContract]
+  public abstract class Schema : ReactiveObject
+  {
+    [DataMember]
+    public abstract string Name { get; }
+    [DataMember]
+    public bool HasData;
+
+    //only used to highlight/clear mapped elements
+    //needs to be set by the GetExistingSchemaElements method
+
+    public string ApplicationId;
+
+    public abstract string Summary { get; }
+    public abstract string GetSerializedSchema();
+
+    public string GetSerializedViewModel()
+    {
+      HasData = true;
+      //needed bc we're serializing an interface
+      var settings = new JsonSerializerSettings()
+      {
+        TypeNameHandling = TypeNameHandling.All
+      };
+      var serializedViewModel = JsonConvert.SerializeObject(this, settings);
+      return serializedViewModel;
+    }
+
+  }
+
+  /// <summary>
+  /// Basic Revit Element with Family, Type and Level properties
+  /// </summary>
+  public class RevitBasicViewModel : Schema
+  {
+    public override string Name => "";
+
+    private List<RevitFamily> _families;
+    public List<RevitFamily> Families
+    {
+      get => _families;
+      set
+      {
+
+        this.RaiseAndSetIfChanged(ref _families, value);
+
+        //force the refresh of the dropdown after these lists have been updated
+        SelectedFamily = Families?.FirstOrDefault(x => x.Name == SelectedFamily?.Name);
+        SelectedType = SelectedFamily?.Types?.FirstOrDefault(x => x == SelectedType);
+      }
+    }
+
+    private RevitFamily _selectedFamily;
+    [DataMember]
+    public RevitFamily SelectedFamily
+    {
+      get => _selectedFamily;
+      set => this.RaiseAndSetIfChanged(ref _selectedFamily, value);
+    }
+
+    private string _selectedtype;
+    [DataMember]
+    public string SelectedType
+    {
+      get => _selectedtype;
+      set => this.RaiseAndSetIfChanged(ref _selectedtype, value);
+    }
+
+    private List<string> _levels;
+    public List<string> Levels
+    {
+      get => _levels;
+      set
+      {
+        this.RaiseAndSetIfChanged(ref _levels, value);
+
+        //force the refresh of the dropdown after these lists have been updated
+        SelectedLevel = Levels?.FirstOrDefault(x => x == SelectedLevel);
+      }
+    }
+
+
+    private string _selectedLevel;
+    [DataMember]
+    public string SelectedLevel
+    {
+      get => _selectedLevel;
+      set => this.RaiseAndSetIfChanged(ref _selectedLevel, value);
+    }
+
+    public override string Summary => $"{SelectedFamily?.Name} - {SelectedType}";
+
+
+    public RevitBasicViewModel()
+    {
+    }
+
+    public override string GetSerializedSchema()
+    {
+      return "";
+    }
+  }
+
+
+
+  public class RevitWallViewModel : RevitBasicViewModel
+  {
+    public override string Name => "Wall";
+
+
+    public override string GetSerializedSchema()
+    {
+      var obj = new RevitWall(SelectedFamily.Name, SelectedType, null, new RevitLevel(SelectedLevel), 0);
+      return Operations.Serialize(obj);
+    }
+  }
+
+
+  public class RevitBeamViewModel : RevitBasicViewModel
+  {
+    public override string Name => "Beam";
+
+    public override string GetSerializedSchema()
+    {
+      var obj = new RevitBeam(SelectedFamily.Name, SelectedType, null, new RevitLevel(SelectedLevel));
+      return Operations.Serialize(obj);
+    }
+  }
+
+  public class RevitBraceViewModel : RevitBasicViewModel
+  {
+    public override string Name => "Brace";
+
+    public override string GetSerializedSchema()
+    {
+      var obj = new RevitBrace(SelectedFamily.Name, SelectedType, null, new RevitLevel(SelectedLevel));
+      return Operations.Serialize(obj);
+    }
+  }
+
+  public class RevitFamilyInstanceViewModel : RevitBasicViewModel
+  {
+    public override string Name => "Family Instance";
+
+    public override string GetSerializedSchema()
+    {
+      var obj = new FamilyInstance(null, SelectedFamily.Name, SelectedType, new RevitLevel(SelectedLevel));
+      return Operations.Serialize(obj);
+    }
+  }
+
+  public class DirectShapeFreeformViewModel : Schema
+  {
+    public override string Name => "DirectShape";
+
+    private string _shapeName;
+    [DataMember]
+    public string ShapeName
+    {
+      get => _shapeName;
+      set => this.RaiseAndSetIfChanged(ref _shapeName, value);
+    }
+
+
+    private List<string> _categories;
+    public List<string> Categories
+    {
+      get => _categories;
+      set => this.RaiseAndSetIfChanged(ref _categories, value);
+    }
+
+    private string _selectedCategory;
+    [DataMember]
+    public string SelectedCategory
+    {
+      get => _selectedCategory;
+      set => this.RaiseAndSetIfChanged(ref _selectedCategory, value);
+    }
+
+    private bool _freeform;
+    [DataMember]
+    public bool Freeform
+    {
+      get => _freeform;
+      set => this.RaiseAndSetIfChanged(ref _freeform, value);
+    }
+
+    public override string Summary => $"{ShapeName} - {SelectedCategory}";
+
+    public DirectShapeFreeformViewModel()
+    {
+      Categories = Enum.GetValues(typeof(RevitCategory)).Cast<RevitCategory>().Select(x => x.ToString()).ToList(); ;
+    }
+
+
+    public override string GetSerializedSchema()
+    {
+      //TODO: look into supporting the category and name filed for freeform elements too
+      if (Freeform)
+        return Operations.Serialize(new FreeformElement());
+
+      var cat = RevitCategory.GenericModels;
+      Enum.TryParse(SelectedCategory, out cat);
+      var ds = new DirectShape(); //don't use the constructor
+      ds.name = ShapeName;
+      ds.category = cat;
+      return Operations.Serialize(ds);
+    }
+  }
+
+
+  [DataContract]
+  public class RevitFamily : ReactiveObject
+  {
+    [DataMember]
+    public string Name { get; set; }
+
+    private List<string> _types;
+    public List<string> Types
+    {
+      get => _types;
+      set => this.RaiseAndSetIfChanged(ref _types, value);
+    }
+
+    public RevitFamily(string name, List<string> types)
+    {
+      Name = name;
+      Types = types;
+    }
+
+    public RevitFamily()
+    {
+    }
+  }
+
+
+  public class SchemaGroup
+  {
+    public string Name { get; set; }
+    public List<Schema> Schemas { get; set; }
+
+    public SchemaGroup(string name, List<Schema> schemas)
+    {
+      Name = name;
+      Schemas = schemas;
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/MenuItemViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/MenuItemViewModel.cs
index 85b348eb86..20e361758e 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/MenuItemViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/MenuItemViewModel.cs
@@ -2,6 +2,7 @@
 using Material.Icons;
 using Material.Icons.Avalonia;
 using ReactiveUI;
+using Speckle.Core.Credentials;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +15,7 @@ namespace DesktopUI2.ViewModels
   public class MenuItemViewModel
   {
     public object Header { get; set; }
-    public MaterialIcon Icon { get; set; }
+    public object Icon { get; set; }
     public ICommand Command { get; set; }
     public object CommandParameter { get; set; }
     public IList<MenuItemViewModel> Items { get; set; }
@@ -47,17 +48,25 @@ public MenuItemViewModel(MenuItem item, object commandParameter)
 
     }
 
-    public MenuItemViewModel(ICommand command, object commandParameter, string header, MaterialIconKind icon)
+    //public MenuItemViewModel(ICommand command, object commandParameter, string header, MaterialIconKind icon)
+    //{
+    //  Command = command;
+    //  CommandParameter = commandParameter;
+    //  Header = header;
+    //  Icon = new MaterialIcon { Kind = icon, Foreground = Avalonia.Media.Brushes.Gray };
+    //}
+
+    public MenuItemViewModel(Action action, string header, MaterialIconKind icon)
     {
-      Command = command;
-      CommandParameter = commandParameter;
+      Command = ReactiveCommand.Create(action);
       Header = header;
       Icon = new MaterialIcon { Kind = icon, Foreground = Avalonia.Media.Brushes.Gray };
     }
 
-    public MenuItemViewModel(Action action, string header, MaterialIconKind icon)
+    public MenuItemViewModel(Action<Account> action, object commandParameter, string header, MaterialIconKind icon)
     {
       Command = ReactiveCommand.Create(action);
+      CommandParameter = commandParameter;
       Header = header;
       Icon = new MaterialIcon { Kind = icon, Foreground = Avalonia.Media.Brushes.Gray };
     }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/NotificationViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/NotificationViewModel.cs
new file mode 100644
index 0000000000..e27349b7cc
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/ViewModels/NotificationViewModel.cs
@@ -0,0 +1,45 @@
+using Avalonia.Media;
+using Material.Icons;
+using Material.Icons.Avalonia;
+using ReactiveUI;
+using Speckle.Core.Api;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+
+namespace DesktopUI2.ViewModels
+{
+  public class NotificationViewModel : ReactiveObject
+  {
+    public string Message { get; set; }
+
+    public MaterialIconKind Icon { get; set; }
+    public IBrush IconColor { get; set; }
+    private AccountViewModel _user;
+    public AccountViewModel User
+    {
+      get => _user;
+      set => this.RaiseAndSetIfChanged(ref _user, value);
+    }
+    public Action Launch { get; set; }
+    public NotificationViewModel()
+    {
+
+    }
+    public NotificationViewModel(PendingStreamCollaborator invite, string serverUrl)
+    {
+      User = new AccountViewModel(invite.invitedBy);
+      Message = $"{invite.invitedBy.name} is inviting you to collaborate on '{invite.streamName}'!";
+      Launch = () =>
+      {
+        Process.Start(new ProcessStartInfo($"{serverUrl}/streams/{invite.streamId}") { UseShellExecute = true });
+      };
+    }
+
+    public void LaunchCommand()
+    {
+      Launch.Invoke();
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/NotificationsViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/NotificationsViewModel.cs
new file mode 100644
index 0000000000..922b2eef4f
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/ViewModels/NotificationsViewModel.cs
@@ -0,0 +1,43 @@
+using ReactiveUI;
+using Speckle.Core.Logging;
+using Splat;
+using System;
+using System.Collections.Generic;
+using System.Reactive;
+using System.Text;
+
+namespace DesktopUI2.ViewModels
+{
+  public class NotificationsViewModel : ReactiveObject, IRoutableViewModel
+  {
+    public IScreen HostScreen { get; }
+
+    public ReactiveCommand<Unit, Unit> GoBack => MainViewModel.RouterInstance.NavigateBack;
+
+
+    public string UrlPathSegment { get; } = "notifications";
+    public ConnectorBindings Bindings { get; private set; } = new DummyBindings();
+
+    private List<NotificationViewModel> _notifications;
+    public List<NotificationViewModel> Notifications
+    {
+      get => _notifications;
+      private set => this.RaiseAndSetIfChanged(ref _notifications, value);
+
+    }
+
+    public NotificationsViewModel(IScreen screen, List<NotificationViewModel> notifications)
+    {
+      try
+      {
+        HostScreen = screen;
+        Bindings = Locator.Current.GetService<ConnectorBindings>();
+        Notifications = notifications;
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+      }
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/OneClickViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/OneClickViewModel.cs
index 35121246d4..f578219596 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/OneClickViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/OneClickViewModel.cs
@@ -5,6 +5,7 @@
 using Speckle.Core.Api;
 using Speckle.Core.Credentials;
 using Speckle.Core.Logging;
+using Splat;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -13,147 +14,264 @@
 
 namespace DesktopUI2.ViewModels
 {
-  public class OneClickViewModel : ReactiveObject
+  public class OneClickViewModel : ReactiveObject, IRoutableViewModel
   {
-    List<StreamState> SavedStreams { get; set; } = new List<StreamState>();
+    public IScreen HostScreen { get; }
+
+    public string UrlPathSegment { get; } = "oneclick";
+
 
     public ConnectorBindings Bindings { get; private set; } = new DummyBindings();
 
-    public bool HasFileStream => FileStream != null;
+    #region bindings
+
+    public string Title => "for " + Bindings.GetHostAppNameVersion();
+    public string Version => "v" + Bindings.ConnectorVersion;
+    List<StreamState> SavedStreams { get; set; } = new List<StreamState>();
+
+    private ProgressViewModel _progress;
+    public ProgressViewModel Progress
+    {
+      get => _progress;
+      set => this.RaiseAndSetIfChanged(ref _progress, value);
+
+    }
 
     private string _fileName;
 
     private StreamState _fileStream;
-    public StreamState FileStream
+
+
+    private bool _sendClicked;
+    public bool SendClicked
     {
-      get => _fileStream;
-      set
-      {
-        this.RaiseAndSetIfChanged(ref _fileStream, value);
-        this.RaisePropertyChanged("HasFileStream");
-      }
+      get => _sendClicked;
+      set => this.RaiseAndSetIfChanged(ref _sendClicked, value);
+
     }
 
-    public OneClickViewModel(ConnectorBindings _bindings, StreamState fileStream = null)
+    private string _sentText;
+    public string SentText
     {
-      Bindings = _bindings;
-      SavedStreams = Bindings.GetStreamsInFile();
-      _fileName = Bindings.GetFileName();
+      get => _sentText;
+      set => this.RaiseAndSetIfChanged(ref _sentText, value);
 
-      if (fileStream == null)
-        LoadFileStream();
-      else
-        FileStream = fileStream;
     }
 
-    private void LoadFileStream()
+    private bool _successfulSend;
+    public bool SuccessfulSend
     {
-      // get default account
-      var account = AccountManager.GetDefaultAccount();
-      var client = new Client(account);
+      get => _successfulSend;
+      set => this.RaiseAndSetIfChanged(ref _successfulSend, value);
 
-      var fileStream = SavedStreams.Where(o => o.CachedStream.name == _fileName && o.Client.Account == account)?.FirstOrDefault();
-      if (fileStream != null)
+    }
+
+    private string Url
+    {
+      get
       {
-        FileStream = fileStream;
+        var commit = "";
+        if (!string.IsNullOrEmpty(Id))
+          commit = "commits/" + Id;
+        return $"{_fileStream.ServerUrl.TrimEnd('/')}/streams/{_fileStream.StreamId}/{commit}";
       }
-      else // try to find stream in account
-      {
-        Stream foundStream = Task.Run(async () => await SearchStreams(client)).Result;
+    }
 
-        if (foundStream == null) // create the stream
-        {
-          var description = $"Automatic stream for {_fileName}";
-          try
-          {
-            string streamId = Task.Run(async () => await client.StreamCreate(new StreamCreateInput { description = description, name = _fileName, isPublic = false })).Result;
-            foundStream = Task.Run(async () => await client.StreamGet(streamId)).Result;
-          }
-          catch (Exception e) { }
-        }
+    #endregion
 
-        FileStream = new StreamState(account, foundStream) { BranchName = "main" };
-        SavedStreams.Add(FileStream);
-        Bindings.WriteStreamsToFile(SavedStreams);
+    private string Id { get; set; }
 
-        if (HomeViewModel.Instance != null)
-          HomeViewModel.Instance.UpdateSavedStreams(SavedStreams);
-      }
-    }
-
-    private async Task<Stream> SearchStreams(Client client)
+    public OneClickViewModel(IScreen screen)
     {
-      Stream stream = null;
       try
       {
-        var streams = await client.StreamSearch(_fileName);
-        stream = streams.Where(s => s.name.Equals(_fileName))?.FirstOrDefault();
+        HostScreen = screen;
+        Bindings = Locator.Current.GetService<ConnectorBindings>();
+      }
+      catch (Exception ex)
+      {
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
       }
-      catch (Exception) { }
-      return stream;
     }
 
     public async void Send()
     {
+      SendClicked = true;
+      Progress = new ProgressViewModel();
+      Progress.ProgressTitle = "Sending to Speckle 🚀...";
+      Progress.IsProgressing = true;
+
+
+      string fileName = null;
+      try
+      {
+        fileName = Bindings.GetFileName();
+      }
+      catch
+      {
+        //todo: handle properly in each connector bindings
+      }
+
+      //filename is different, might have been renamed or be a different document
+      if (_fileName != fileName)
+        _fileStream = null;
+
+      _fileName = fileName;
+
+      if (_fileStream == null)
+        _fileStream = await GetOrCreateStreamState();
       // check if objs are selected and set streamstate filter
       var filters = Bindings.GetSelectionFilters();
       var selection = Bindings.GetSelectedObjects();
+      //TODO: check if these filters exist
       if (selection.Count > 0)
       {
-        FileStream.Filter = filters.Where(o => o.Slug == "manual").First();
-        FileStream.Filter.Selection = selection;
-        FileStream.CommitMessage = "Sent selection";
+        _fileStream.Filter = filters.First(o => o.Slug == "manual");
+        _fileStream.Filter.Selection = selection;
+        _fileStream.CommitMessage = "Sent selection";
       }
       else
       {
-        FileStream.Filter = filters.Where(o => o.Slug == "all").First();
-        FileStream.CommitMessage = "Sent everything";
+        _fileStream.Filter = filters.First(o => o.Slug == "all");
+        _fileStream.CommitMessage = "Sent everything";
       }
-      FileStream.BranchName = "main";
+      _fileStream.BranchName = "main";
 
       // set settings
-      if (FileStream.Settings == null || FileStream.Settings.Count == 0)
+      if (_fileStream.Settings == null || _fileStream.Settings.Count == 0)
       {
         var settings = Bindings.GetSettings();
-        FileStream.Settings = settings;
+        _fileStream.Settings = settings;
       }
 
       // send to stream
+      // TODO: report conversions errors, empty commit etc
       try
       {
-        var progress = new ProgressViewModel();
-        progress.ProgressTitle = "Sending to Speckle 🚀";
-        progress.IsProgressing = true;
-
-        var dialog = new QuickOpsDialog();
-        dialog.DataContext = progress;
-        dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-        dialog.Show();
-
-        await Task.Run(() => Bindings.SendStream(FileStream, progress));
-        progress.IsProgressing = false;
-        dialog.Close();
-        if (!progress.CancellationTokenSource.IsCancellationRequested)
-        {
-          Analytics.TrackEvent(AccountManager.GetDefaultAccount(), Analytics.Events.Send, new Dictionary<string, object> { { "method", "OneClick" } });
-          FileStream.LastUsed = DateTime.Now.ToString();
+        Id = await Task.Run(() => Bindings.SendStream(_fileStream, Progress));
 
-          // open in browser
-          if (FileStream.PreviousCommitId != null)
+        if (!string.IsNullOrEmpty(Id))
+        {
+          var errorsCount = Progress.Report.ReportObjects.Count(x => x.Status == Speckle.Core.Models.ApplicationObject.State.Failed);
+          if (errorsCount > 0)
           {
-            string commitUrl = $"{FileStream.ServerUrl.TrimEnd('/')}/streams/{FileStream.StreamId}/commits/{FileStream.PreviousCommitId}";
-            Process.Start(new ProcessStartInfo(commitUrl) { UseShellExecute = true });
+            var s = errorsCount == 1 ? "" : "s";
+            SentText = $"Done 🎉\nOperation completed with {errorsCount} error{s}";
+            SuccessfulSend = true;
+          }
+          else if (Progress.Report.ReportObjects.Count == 0)
+          {
+            SentText = "Nothing was sent!\nPlease try again or switch to advanced mode.";
+            SuccessfulSend = false;
+          }
+          else
+          {
+            SentText = "Done 🎉\nYour model has been sent!";
+            SuccessfulSend = true;
           }
         }
+        else
+        {
+          SentText = "Semething went wrong!\nPlease try again or switch to advanced mode.";
+          SuccessfulSend = false;
+        }
+
+        Progress.IsProgressing = false;
+
+        if (!Progress.CancellationTokenSource.IsCancellationRequested)
+        {
+          Analytics.TrackEvent(AccountManager.GetDefaultAccount(), Analytics.Events.Send, new Dictionary<string, object> { { "method", "OneClick" } });
+          _fileStream.LastUsed = DateTime.Now.ToString();
+        }
       }
       catch (Exception ex)
-      { }
-
-      if (Bindings.UpdateSavedStreams != null)
-        Bindings.UpdateSavedStreams(SavedStreams);
+      {
+        //TODO: report errors to user
+        Log.CaptureException(ex, Sentry.SentryLevel.Error);
+      }
 
       if (HomeViewModel.Instance != null)
-        HomeViewModel.Instance.UpdateSavedStreams(SavedStreams);
+        HomeViewModel.Instance.AddSavedStream(new StreamViewModel(_fileStream, HostScreen, HomeViewModel.Instance.RemoveSavedStreamCommand));
+    }
+
+    private async Task<StreamState> GetOrCreateStreamState()
+    {
+      // get default account
+      var account = AccountManager.GetDefaultAccount();
+      var client = new Client(account);
+
+      SavedStreams = Bindings.GetStreamsInFile();
+      var fileStream = SavedStreams.Where(o => o.CachedStream.name == _fileName && o.Client.Account == account)?.FirstOrDefault();
+      if (fileStream != null)
+      {
+        return fileStream;
+      }
+      // try to find stream in account
+      var foundStream = await SearchStreams(client);
+
+      if (foundStream != null)
+      {
+        return new StreamState(account, foundStream) { BranchName = "main" };
+      }
+
+      // create the stream
+      string streamId = await client.StreamCreate(new StreamCreateInput { description = "Autogenerated Stream for QuickSend", name = _fileName, isPublic = false });
+      var newStream = await client.StreamGet(streamId);
+
+      return new StreamState(account, newStream) { BranchName = "main" };
+
+
+    }
+
+    private async Task<Stream> SearchStreams(Client client)
+    {
+      Stream stream = null;
+      try
+      {
+        var streams = await client.StreamSearch(_fileName);
+        stream = streams.FirstOrDefault(s => s.name == _fileName);
+      }
+      catch (Exception) { }
+      return stream;
+    }
+
+    private void ShareCommand()
+    {
+      MainViewModel.RouterInstance.Navigate.Execute(new CollaboratorsViewModel(HostScreen, new StreamViewModel(_fileStream, HostScreen, null)));
+
+      Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Share Open" } });
+    }
+
+    private void CloseSendModal()
+    {
+      if (Progress.IsProgressing)
+      {
+        Progress.CancelCommand();
+      }
+      SendClicked = false;
+    }
+
+    private void ViewOnlineCommand()
+    {
+
+
+      Process.Start(new ProcessStartInfo(Url) { UseShellExecute = true });
     }
+
+    private void CopyCommand()
+    {
+      Avalonia.Application.Current.Clipboard.SetTextAsync(Url);
+    }
+
+    private void AdvancedModeCommand()
+    {
+      var config = ConfigManager.Load();
+      config.OneClickMode = false;
+      ConfigManager.Save(config);
+
+      MainViewModel.Instance.NavigateToDefaultScreen();
+    }
+
+
   }
 }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/PopUpNotificationViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/PopUpNotificationViewModel.cs
new file mode 100644
index 0000000000..cb8186fd7e
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/ViewModels/PopUpNotificationViewModel.cs
@@ -0,0 +1,35 @@
+using Avalonia.Controls.Notifications;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DesktopUI2.ViewModels
+{
+  public class PopUpNotificationViewModel : INotification
+  {
+    public string Title { get; set; }
+    public string Message { get; set; }
+
+    //Can't get these to work when implementing INotification
+    public TimeSpan Expiration { get; set; } = TimeSpan.FromSeconds(7);
+
+    public NotificationType Type { get; set; }
+
+    public Action OnClose { get; set; }
+
+    public Action OnClick { get; set; }
+
+    public void ViewCommand()
+    {
+      OnClick.Invoke();
+    }
+
+    public PopUpNotificationViewModel()
+    {
+
+    }
+
+
+
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/ProgressViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/ProgressViewModel.cs
index 88eaa527cd..96be95857c 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/ProgressViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/ProgressViewModel.cs
@@ -130,7 +130,7 @@ public void GetHelpCommand()
     public void CancelCommand()
     {
       CancellationTokenSource.Cancel();
-      Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Cancelled Quick Op" } });
+      Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Cancel Progress" } });
     }
   }
 }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/Share/AddCollaboratorsViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/Share/AddCollaboratorsViewModel.cs
deleted file mode 100644
index f3947d61f4..0000000000
--- a/DesktopUI2/DesktopUI2/ViewModels/Share/AddCollaboratorsViewModel.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Selection;
-using DesktopUI2.Views.Pages.ShareControls;
-using ReactiveUI;
-using Speckle.Core.Api;
-using Speckle.Core.Credentials;
-using Speckle.Core.Logging;
-using Splat;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-namespace DesktopUI2.ViewModels.Share
-{
-  public class AddCollaboratorsViewModel : ReactiveObject, IRoutableViewModel
-  {
-    public IScreen HostScreen { get; }
-    public string UrlPathSegment { get; } = "collaborators";
-
-    private ConnectorBindings Bindings;
-
-    #region bindings
-
-    private string _searchQuery = "";
-
-    private Action userSearchDebouncer = null;
-
-    public string SearchQuery
-    {
-      get => _searchQuery;
-      set
-      {
-        this.RaiseAndSetIfChanged(ref _searchQuery, value);
-        Search();
-      }
-    }
-    private List<AccountViewModel> _users;
-    public List<AccountViewModel> Users
-    {
-      get => _users;
-      private set
-      {
-        this.RaiseAndSetIfChanged(ref _users, value);
-      }
-    }
-
-    private ObservableCollection<AccountViewModel> _selectedUsers = new ObservableCollection<AccountViewModel>();
-    public ObservableCollection<AccountViewModel> AddedUsers
-    {
-      get => _selectedUsers;
-      private set
-      {
-        this.RaiseAndSetIfChanged(ref _selectedUsers, value);
-      }
-    }
-
-    public AccountViewModel SelectedUser
-    {
-      set
-      {
-        if (value != null)
-        {
-          AddedUsers.Add(value);
-          SearchQuery = "";
-          this.RaisePropertyChanged("AddedUsers");
-          this.RaisePropertyChanged("HasAddedUsers");
-        }
-
-      }
-    }
-
-
-    private bool _dropDownOpen;
-    public bool DropDownOpen
-    {
-      get => _dropDownOpen;
-      private set
-      {
-        this.RaiseAndSetIfChanged(ref _dropDownOpen, value);
-      }
-    }
-
-    private bool _showProgress;
-    public bool ShowProgress
-    {
-      get => _showProgress;
-      private set
-      {
-        this.RaiseAndSetIfChanged(ref _showProgress, value);
-      }
-    }
-
-    public bool HasAddedUsers
-    {
-      get => AddedUsers.Any();
-    }
-
-    public bool HasSelectedUsers
-    {
-      get => SelectionModel.SelectedItems.Any();
-    }
-
-    public SelectionModel<AccountViewModel> SelectionModel { get; private set; }
-    #endregion
-
-    public AddCollaboratorsViewModel(IScreen screen)
-    {
-      HostScreen = screen;
-      Bindings = Locator.Current.GetService<ConnectorBindings>();
-
-      userSearchDebouncer = Utils.Debounce(SearchUsers);
-      Setup.Init(Bindings.GetHostAppNameVersion(), Bindings.GetHostAppName());
-
-      SelectionModel = new SelectionModel<AccountViewModel>();
-      SelectionModel.SingleSelect = false;
-      SelectionModel.SelectionChanged += SelectionModel_SelectionChanged;
-    }
-
-    private void Search()
-    {
-
-      Focus();
-      if (SearchQuery.Length < 3)
-        return;
-
-      if (SearchQuery.Contains("@"))
-      {
-        if (Utils.IsValidEmail(SearchQuery))
-        {
-          var emailAcc = new AccountViewModel()
-          {
-            Name = SearchQuery
-          };
-          Users = new List<AccountViewModel> { emailAcc };
-
-          ShowProgress = false;
-          DropDownOpen = true;
-        }
-      }
-      else
-      {
-        userSearchDebouncer();
-      }
-
-    }
-
-    //focus is lost when the dropdown gets closed
-    private void Focus()
-    {
-      DropDownOpen = false;
-      var searchBox = AddCollaborators.Instance.FindControl<TextBox>("SearchBox");
-      searchBox.Focus();
-    }
-
-    private void SelectionModel_SelectionChanged(object sender, SelectionModelSelectionChangedEventArgs<AccountViewModel> e)
-    {
-      this.RaisePropertyChanged("HasSelectedUsers");
-    }
-
-    private async void SearchUsers()
-    {
-      ShowProgress = true;
-      var acc = AccountManager.GetDefaultAccount();
-
-      var client = new Client(acc);
-      Users = (await client.UserSearch(SearchQuery)).Select(x => new AccountViewModel(x)).ToList();
-
-      ShowProgress = false;
-      DropDownOpen = true;
-
-    }
-
-    private async void ShareCommand()
-    {
-      ShareViewModel.RouterInstance.Navigate.Execute(new SendingViewModel(HostScreen, AddedUsers.ToList()));
-    }
-
-
-    private void ClearSearchCommand()
-    {
-      SearchQuery = "";
-    }
-
-    private void RemoveSeletedUsersCommand()
-    {
-      foreach (var item in SelectionModel.SelectedItems.ToList())
-      {
-        AddedUsers.Remove(item);
-      }
-
-      this.RaisePropertyChanged("HasSelectedUsers");
-      this.RaisePropertyChanged("HasAddedUsers");
-    }
-
-
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/Share/SendingViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/Share/SendingViewModel.cs
deleted file mode 100644
index 7e4d319543..0000000000
--- a/DesktopUI2/DesktopUI2/ViewModels/Share/SendingViewModel.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using DesktopUI2.Models;
-using ReactiveUI;
-using Speckle.Core.Api;
-using Speckle.Core.Credentials;
-using Speckle.Core.Logging;
-using Splat;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace DesktopUI2.ViewModels.Share
-{
-  public class SendingViewModel : ReactiveObject, IRoutableViewModel
-  {
-    public IScreen HostScreen { get; }
-    public string UrlPathSegment { get; } = "sending";
-
-    private ConnectorBindings Bindings;
-
-    #region bindings
-    List<StreamState> SavedStreams { get; set; } = new List<StreamState>();
-
-    private ProgressViewModel _progress;
-    public ProgressViewModel Progress
-    {
-      get => _progress;
-      set => this.RaiseAndSetIfChanged(ref _progress, value);
-
-    }
-
-    public bool HasFileStream => FileStream != null;
-
-    private string _fileName;
-
-    private StreamState _fileStream;
-    public StreamState FileStream
-    {
-      get => _fileStream;
-      set
-      {
-        this.RaiseAndSetIfChanged(ref _fileStream, value);
-        this.RaisePropertyChanged("HasFileStream");
-      }
-    }
-
-    private bool _sendComplete;
-    public bool SendComplete
-    {
-      get => _sendComplete;
-      set => this.RaiseAndSetIfChanged(ref _sendComplete, value);
-
-    }
-
-    private string Url
-    {
-      get
-      {
-        var commit = "";
-        if (!string.IsNullOrEmpty(Id))
-          commit = "commits/" + Id;
-        return $"{FileStream.ServerUrl.TrimEnd('/')}/streams/{FileStream.StreamId}/{commit}";
-      }
-    }
-
-    #endregion
-
-    private string Id { get; set; }
-    private List<AccountViewModel> Users { get; set; }
-
-    public SendingViewModel(IScreen screen, List<AccountViewModel> users)
-    {
-      HostScreen = screen;
-      Bindings = Locator.Current.GetService<ConnectorBindings>();
-      Users = users;
-      Start();
-    }
-
-    private async void Start()
-    {
-      await SetupStream();
-      await Send();
-      await AddCollaborators();
-    }
-
-    private async Task SetupStream()
-    {
-      SavedStreams = Bindings.GetStreamsInFile();
-      _fileName = Bindings.GetFileName();
-
-      // get default account
-      var account = AccountManager.GetDefaultAccount();
-      var client = new Client(account);
-
-      var fileStream = SavedStreams.FirstOrDefault(o => o.CachedStream.name == _fileName && o.Client.Account == account);
-      if (fileStream != null)
-      {
-        FileStream = fileStream;
-      }
-      else // try to find stream in account
-      {
-        var foundStream = await SearchStreams(client);
-
-        if (foundStream == null) // create the stream
-        {
-          var description = $"Sharing {_fileName} via Speckle!";
-          try
-          {
-            string streamId = await client.StreamCreate(new StreamCreateInput { description = description, name = _fileName, isPublic = false });
-            foundStream = await client.StreamGet(streamId);
-          }
-          catch (Exception e)
-          {
-            Dialogs.ShowDialog("Could not share", "There was an error creating the Stream: " + e.Message, Material.Dialog.Icons.DialogIconKind.Error);
-            return;
-          }
-        }
-
-
-        FileStream = new StreamState(account, foundStream) { BranchName = "main" };
-        SavedStreams.Add(FileStream);
-        Bindings.WriteStreamsToFile(SavedStreams);
-
-        if (HomeViewModel.Instance != null)
-          HomeViewModel.Instance.UpdateSavedStreams(SavedStreams);
-
-      }
-    }
-
-    private async Task AddCollaborators()
-    {
-      foreach (var user in Users)
-      {
-        if (Utils.IsValidEmail(user.Name))
-        {
-          try
-          {
-            await FileStream.Client.StreamInviteCreate(new StreamInviteCreateInput { email = user.Name, streamId = FileStream.StreamId, message = "I would like to share a model with you via Speckle!" });
-          }
-          catch (Exception e)
-          {
-
-          }
-        }
-        else
-        {
-          try
-          {
-            await FileStream.Client.StreamGrantPermission(new StreamPermissionInput { userId = user.Id, streamId = FileStream.StreamId, role = "stream:contributor" });
-          }
-          catch (Exception e)
-          {
-
-          }
-        }
-      }
-    }
-
-    private async Task Send()
-    {
-
-
-      //SEND
-      // check if objs are selected and set streamstate filter
-      var filters = Bindings.GetSelectionFilters();
-      var selection = Bindings.GetSelectedObjects();
-      if (selection.Count > 0)
-      {
-        FileStream.Filter = filters.Where(o => o.Slug == "manual").First();
-        FileStream.Filter.Selection = selection;
-        FileStream.CommitMessage = "Sent selection";
-      }
-      else
-      {
-        FileStream.Filter = filters.Where(o => o.Slug == "all").First();
-        FileStream.CommitMessage = "Sent everything";
-      }
-      FileStream.BranchName = "main";
-
-      // set settings
-      if (FileStream.Settings == null || FileStream.Settings.Count == 0)
-      {
-        var settings = Bindings.GetSettings();
-        FileStream.Settings = settings;
-      }
-
-      // send to stream
-      try
-      {
-        Progress = new ProgressViewModel();
-        Progress.ProgressTitle = "Sharing via Speckle 🚀";
-        Progress.IsProgressing = true;
-
-        Id = await Bindings.SendStream(FileStream, Progress);
-        Progress.IsProgressing = false;
-
-        if (!Progress.CancellationTokenSource.IsCancellationRequested)
-        {
-          Analytics.TrackEvent(AccountManager.GetDefaultAccount(), Analytics.Events.Send, new Dictionary<string, object> { { "method", "QuickShare" } });
-          FileStream.LastUsed = DateTime.Now.ToString();
-
-          SendComplete = true;
-        }
-        else
-          ShareViewModel.RouterInstance.NavigateBack.Execute();
-      }
-      catch (Exception ex)
-      { }
-
-      if (Bindings.UpdateSavedStreams != null)
-        Bindings.UpdateSavedStreams(SavedStreams);
-
-      if (HomeViewModel.Instance != null)
-        HomeViewModel.Instance.UpdateSavedStreams(SavedStreams);
-
-    }
-
-    private async Task<Stream> SearchStreams(Client client)
-    {
-      Stream stream = null;
-      try
-      {
-        var streams = await client.StreamSearch(_fileName);
-        stream = streams.FirstOrDefault(s => s.name == _fileName);
-      }
-      catch (Exception) { }
-      return stream;
-    }
-
-    private void ViewOnlineCommand()
-    {
-
-
-      Process.Start(new ProcessStartInfo(Url) { UseShellExecute = true });
-    }
-
-    private void CopyCommand()
-    {
-      Avalonia.Application.Current.Clipboard.SetTextAsync(Url);
-    }
-
-
-
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/Share/ShareViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/Share/ShareViewModel.cs
deleted file mode 100644
index 487e670830..0000000000
--- a/DesktopUI2/DesktopUI2/ViewModels/Share/ShareViewModel.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using DesktopUI2.Views.Pages.ShareControls;
-using ReactiveUI;
-using Splat;
-using System.Reactive;
-
-namespace DesktopUI2.ViewModels.Share
-{
-  public class ShareViewModel : ViewModelBase, IScreen
-  {
-    public string Title => "for " + Bindings.GetHostAppNameVersion();
-    public string TitleFull => "Quick Share";
-
-    public RoutingState Router { get; private set; }
-    public static RoutingState RouterInstance { get; private set; }
-
-    public ReactiveCommand<Unit, Unit> GoBack => Router.NavigateBack;
-
-    public ConnectorBindings Bindings { get; private set; } = new DummyBindings();
-
-
-
-    public ShareViewModel()
-    {
-      Init();
-    }
-
-    public ShareViewModel(ConnectorBindings _bindings)
-    {
-      Init();
-      Bindings = _bindings;
-    }
-
-    private void Init()
-    {
-      Router = new RoutingState();
-
-      Locator.CurrentMutable.Register(() => new AddCollaborators(), typeof(IViewFor<AddCollaboratorsViewModel>));
-      Locator.CurrentMutable.Register(() => new Sending(), typeof(IViewFor<SendingViewModel>));
-      Locator.CurrentMutable.Register(() => Bindings, typeof(ConnectorBindings));
-
-      RouterInstance = Router; // makes the router available app-wide
-      Router.Navigate.Execute(new AddCollaboratorsViewModel(this));
-
-    }
-
-
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/StreamSelectorViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/StreamSelectorViewModel.cs
new file mode 100644
index 0000000000..e81df6e5fe
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/ViewModels/StreamSelectorViewModel.cs
@@ -0,0 +1,234 @@
+using Avalonia.Controls.Selection;
+using DesktopUI2.Models;
+using DesktopUI2.ViewModels.MappingTool;
+using ReactiveUI;
+using Speckle.Core.Api;
+using Speckle.Core.Credentials;
+using Speckle.Core.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace DesktopUI2.ViewModels
+{
+  public class StreamSelectorViewModel : ReactiveObject
+  {
+    #region bindings
+
+    private Action streamSearchDebouncer = null;
+
+    private bool _noSearch = false;
+
+    private bool _isVisible;
+    public bool IsVisible
+    {
+      get => _isVisible;
+      set
+      {
+        this.RaiseAndSetIfChanged(ref _isVisible, value);
+      }
+    }
+    public SelectionModel<AccountViewModel> SelectionModel { get; private set; }
+
+    private List<AccountViewModel> _accounts = new List<AccountViewModel>();
+    public List<AccountViewModel> Accounts
+    {
+      get => _accounts;
+      private set
+      {
+        this.RaiseAndSetIfChanged(ref _accounts, value);
+      }
+    }
+
+    private string _searchQuery = "";
+
+    public string SearchQuery
+    {
+      get => _searchQuery;
+      set
+      {
+        this.RaiseAndSetIfChanged(ref _searchQuery, value);
+        if (_noSearch)
+          return;
+        if (!string.IsNullOrEmpty(SearchQuery) && SearchQuery.Length <= 2)
+          return;
+
+        streamSearchDebouncer();
+      }
+    }
+    private List<StreamAccountWrapper> _streams;
+    public List<StreamAccountWrapper> Streams
+    {
+      get => _streams;
+      private set
+      {
+        this.RaiseAndSetIfChanged(ref _streams, value);
+      }
+    }
+
+    private StreamAccountWrapper _selectedStream;
+    public StreamAccountWrapper SelectedStream
+    {
+      get => _selectedStream;
+      private set
+      {
+        this.RaiseAndSetIfChanged(ref _selectedStream, value);
+
+        if (value != null)
+        {
+          _noSearch = true;
+          SearchQuery = _selectedStream.Stream.name;
+          _noSearch = false;
+          GetBranches();
+        }
+
+      }
+    }
+
+    private List<Branch> _branches;
+    public List<Branch> Branches
+    {
+      get => _branches;
+      private set
+      {
+        this.RaiseAndSetIfChanged(ref _branches, value);
+      }
+    }
+
+    private Branch _selectedBranch;
+    public Branch SelectedBranch
+    {
+      get => _selectedBranch;
+      private set
+      {
+        this.RaiseAndSetIfChanged(ref _selectedBranch, value);
+      }
+    }
+
+    private bool _showProgress;
+    public bool ShowProgress
+    {
+      get => _showProgress;
+      private set
+      {
+        this.RaiseAndSetIfChanged(ref _showProgress, value);
+      }
+    }
+
+
+    private CancellationTokenSource StreamGetCancelTokenSource = null;
+    #endregion
+
+    public StreamSelectorViewModel()
+    {
+      streamSearchDebouncer = Utils.Debounce(SearchStreams, 500);
+      Accounts = AccountManager.GetAccounts().Select(x => new AccountViewModel(x)).ToList();
+      GetStreams().ConfigureAwait(false);
+    }
+
+
+    //private void SelectionModel_SelectionChanged(object sender, SelectionModelSelectionChangedEventArgs<AccountViewModel> e)
+    //{
+    //  this.RaisePropertyChanged("HasSelectedUsers");
+    //}
+
+    private void SearchStreams()
+    {
+      GetStreams().ConfigureAwait(false);
+    }
+
+    private async Task GetStreams()
+    {
+
+      if (!Accounts.Any())
+        return;
+
+      ShowProgress = true;
+
+      try
+      {
+        //needed for the search feature
+        StreamGetCancelTokenSource?.Cancel();
+        StreamGetCancelTokenSource = new CancellationTokenSource();
+
+        var streams = new List<StreamAccountWrapper>();
+
+        foreach (var account in Accounts)
+        {
+          if (StreamGetCancelTokenSource.IsCancellationRequested)
+            return;
+
+          try
+          {
+            var result = new List<Stream>();
+
+            //NO SEARCH
+            if (SearchQuery == "")
+              result = await account.Client.StreamsGet(StreamGetCancelTokenSource.Token, 25);
+            //SEARCH
+            else
+              result = await account.Client.StreamSearch(StreamGetCancelTokenSource.Token, SearchQuery, 25);
+
+            if (StreamGetCancelTokenSource.IsCancellationRequested)
+              return;
+
+            streams.AddRange(result.Select(x => new StreamAccountWrapper(x, account.Account)));
+
+          }
+          catch (Exception e)
+          {
+            if (e.InnerException is System.Threading.Tasks.TaskCanceledException)
+              return;
+            Log.CaptureException(new Exception("Could not fetch streams", e), Sentry.SentryLevel.Error);
+          }
+        }
+        if (StreamGetCancelTokenSource.IsCancellationRequested)
+          return;
+
+        Streams = streams.OrderByDescending(x => DateTime.Parse(x.Stream.updatedAt)).ToList();
+
+      }
+      catch (Exception e)
+      {
+        Log.CaptureException(new Exception("Could not fetch streams", e), Sentry.SentryLevel.Error);
+      }
+      finally
+      {
+        ShowProgress = false;
+      }
+    }
+
+    private async void GetBranches()
+    {
+      var client = new Client(SelectedStream.Account);
+
+      Branches = await client.StreamGetBranches(SelectedStream.Stream.id, 100, 0);
+
+      if (Branches.Any())
+        SelectedBranch = Branches.FirstOrDefault();
+    }
+
+    private void ClearSearchCommand()
+    {
+      SearchQuery = "";
+      SelectedStream = null;
+      SelectedBranch = null;
+      Streams = new List<StreamAccountWrapper>();
+    }
+
+    private void OkCommand()
+    {
+      IsVisible = false;
+
+      Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => Task.Run(() => MappingsViewModel.Instance.OnBranchSelected()));
+    }
+
+    private void CancelCommand()
+    {
+      IsVisible = false;
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
index 96ee0f692c..9dce1117f4 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
@@ -1,11 +1,13 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Selection;
+using Avalonia.Media.Imaging;
 using Avalonia.Metadata;
+using Avalonia.Threading;
 using DesktopUI2.Models;
 using DesktopUI2.Models.Filters;
 using DesktopUI2.Models.Settings;
-using DesktopUI2.ViewModels.Share;
+using DesktopUI2.Views;
 using DesktopUI2.Views.Pages;
 using DesktopUI2.Views.Windows.Dialogs;
 using DynamicData;
@@ -22,6 +24,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Reactive;
 using System.Threading.Tasks;
 using System.Web;
@@ -30,15 +33,20 @@
 
 namespace DesktopUI2.ViewModels
 {
-  public class StreamViewModel : ReactiveObject, IRoutableViewModel
+  public class StreamViewModel : ReactiveObject, IRoutableViewModel, IDisposable
   {
 
     public StreamState StreamState { get; set; }
     public IScreen HostScreen { get; set; }
 
+
+    #region bindings
+
     private ConnectorBindings Bindings;
 
-    private List<MenuItemViewModel> _menuItems = new List<MenuItemViewModel>();
+
+
+    private CollaboratorsViewModel Collaborators { get; set; }
 
     public ICommand RemoveSavedStreamCommand { get; }
 
@@ -57,8 +65,6 @@ public bool PreviewOn
         this.RaiseAndSetIfChanged(ref _previewOn, value);
       }
     }
-
-    #region bindings
     private Stream _stream;
     public Stream Stream
     {
@@ -72,6 +78,8 @@ public ProgressViewModel Progress
       get => _progress;
       set => this.RaiseAndSetIfChanged(ref _progress, value);
     }
+
+    private List<MenuItemViewModel> _menuItems = new List<MenuItemViewModel>();
     public List<MenuItemViewModel> MenuItems
     {
       get => _menuItems;
@@ -105,31 +113,6 @@ public string LastUsed
       }
     }
 
-    public string NotificationUrl { get; set; }
-    public bool SuccessfulSend { get; set; } = false;
-
-    private string _notification;
-    public string Notification
-    {
-      get => _notification;
-      set
-      {
-        this.RaiseAndSetIfChanged(ref _notification, value);
-        this.RaisePropertyChanged("ShowNotification");
-        this.RaisePropertyChanged("ShowSharePrompt");
-      }
-    }
-
-    public bool ShowNotification
-    {
-      get => !string.IsNullOrEmpty(Notification);
-    }
-
-    public bool ShowSharePrompt
-    {
-      get => !string.IsNullOrEmpty(Notification) && !IsReceiver && SuccessfulSend && Stream.collaborators.Count == 1;
-    }
-
     private bool _isRemovingStream;
     public bool IsRemovingStream
     {
@@ -156,18 +139,23 @@ private set
       }
     }
 
+    private int _selectedTab = 0;
+    public int SelectedTab
+    {
+      get => _selectedTab;
+      private set => this.RaiseAndSetIfChanged(ref _selectedTab, value);
+
+    }
+
     public string UrlPathSegment { get; } = "stream";
 
-    private Client Client { get; }
+    internal Client Client { get; }
 
-    public ReactiveCommand<Unit, Unit> GoBack
+    public void GoBack()
     {
-      get
-      {
-        PreviewOn = false;
-        Bindings.ResetDocument();
-        return MainViewModel.RouterInstance.NavigateBack;
-      }
+      PreviewOn = false;
+      Bindings.ResetDocument();
+      MainViewModel.GoHome();
     }
 
     //If we don't have access to this stream
@@ -278,19 +266,16 @@ public Commit SelectedCommit
             PreviewImageUrl = Client.Account.serverInfo.url + $"/preview/{Stream.id}/branches/{Uri.EscapeDataString(SelectedBranch.Branch.name)}";
           else
             PreviewImageUrl = Client.Account.serverInfo.url + $"/preview/{Stream.id}/commits/{_selectedCommit.id}";
+          PreviewImageUrl360 = $"{PreviewImageUrl}/all";
         }
       }
     }
 
-    private List<Commit> _commits;
+    private List<Commit> _commits = new List<Commit>();
     public List<Commit> Commits
     {
       get => _commits;
-      private set
-      {
-        this.RaiseAndSetIfChanged(ref _commits, value);
-        this.RaisePropertyChanged("HasCommits");
-      }
+      private set => this.RaiseAndSetIfChanged(ref _commits, value);
     }
 
     private List<ActivityViewModel> _activity;
@@ -450,7 +435,6 @@ internal set
       }
     }
     public bool HasSettings => true; //AvailableSettings != null && AvailableSettings.Any();
-    public bool HasCommits => Commits != null && Commits.Any();
 
     public string _previewImageUrl = "";
     public string PreviewImageUrl
@@ -470,6 +454,27 @@ public Avalonia.Media.Imaging.Bitmap PreviewImage
       set => this.RaiseAndSetIfChanged(ref _previewImage, value);
     }
 
+    public string _previewImageUrl360 = "";
+    public string PreviewImageUrl360
+    {
+      get => _previewImageUrl360;
+      set
+      {
+        this.RaiseAndSetIfChanged(ref _previewImageUrl360, value);
+        DownloadImage360(PreviewImageUrl360);
+      }
+    }
+
+    private Avalonia.Media.Imaging.Bitmap _previewImage360 = null;
+    public Avalonia.Media.Imaging.Bitmap PreviewImage360
+    {
+      get => _previewImage360;
+      set => this.RaiseAndSetIfChanged(ref _previewImage360, value);
+    }
+
+    public bool CanOpenCommentsIn3DView { get; set; } = false;
+    private bool _isAddingBranches = false;
+
     #endregion
 
     private string Url
@@ -501,10 +506,15 @@ public void UpdateVisualParentAndInit(IScreen hostScreen)
       //refresh stream, branches, filters etc
       Init();
     }
+    /// <summary>
+    /// Unique identifier to identify this stream view model
+    /// </summary>
+    private string _guid { get; set; }
     public StreamViewModel(StreamState streamState, IScreen hostScreen, ICommand removeSavedStreamCommand)
     {
       try
       {
+        _guid = Guid.NewGuid().ToString();
         StreamState = streamState;
         //use cached stream, then load a fresh one async 
         //this way we can immediately show stream name and other info and update it later if it changed
@@ -522,19 +532,20 @@ public StreamViewModel(StreamState streamState, IScreen hostScreen, ICommand rem
 
         HostScreen = hostScreen;
         RemoveSavedStreamCommand = removeSavedStreamCommand;
+        Collaborators = new CollaboratorsViewModel(HostScreen, this);
 
         //use dependency injection to get bindings
         Bindings = Locator.Current.GetService<ConnectorBindings>();
+        CanOpenCommentsIn3DView = Bindings.CanOpen3DView;
 
         if (Client == null)
         {
           NoAccess = true;
-          Notification = "You do not have access to this Stream.";
-          NotificationUrl = $"{streamState.ServerUrl}/streams/{streamState.StreamId}";
           return;
         }
 
         Init();
+        Subscribe();
         GenerateMenuItems();
 
         var updateTextTimer = new System.Timers.Timer();
@@ -544,7 +555,7 @@ public StreamViewModel(StreamState streamState, IScreen hostScreen, ICommand rem
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error creating stream view model", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
@@ -553,7 +564,6 @@ private void Init()
       try
       {
         GetStream().ConfigureAwait(false);
-
         GetBranchesAndRestoreState();
         GetActivity();
         GetReport();
@@ -562,10 +572,12 @@ private void Init()
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error creating stream view model", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
+
+
     private void UpdateTextTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
     {
       this.RaisePropertyChanged("LastUsed");
@@ -592,7 +604,7 @@ private void GenerateMenuItems()
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error generating menu items", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
@@ -600,15 +612,19 @@ public async Task GetStream()
     {
       try
       {
-        Stream = await Client.StreamGet(StreamState.StreamId);
-        StreamState.CachedStream = Stream;
+        Stream = await Client.StreamGet(StreamState.StreamId, 25);
+        if (Stream.role == "stream:owner")
+        {
+          var streamPendingCollaborators = await Client.StreamGetPendingCollaborators(StreamState.StreamId);
+          Stream.pendingCollaborators = streamPendingCollaborators.pendingCollaborators;
+        }
+        Collaborators.ReloadUsers(); ;
 
-        //subscription
-        Client.SubscribeCommitCreated(StreamState.StreamId);
-        Client.OnCommitCreated += Client_OnCommitCreated;
+        StreamState.CachedStream = Stream;
       }
       catch (Exception e)
       {
+        new SpeckleException("Error retrieving stream", e, true, Sentry.SentryLevel.Error);
       }
     }
 
@@ -665,7 +681,7 @@ internal async void GetBranchesAndRestoreState()
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error restoring stream state", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
@@ -681,8 +697,7 @@ private void GetReport()
 
       if (HasReportItems) // activate report tab
       {
-        var tabControl = StreamEditView.Instance.FindControl<TabControl>("tabStreamEdit");
-        tabControl.SelectedIndex = tabControl.ItemCount - 1;
+        SelectedTab = 4;
       }
 
       // report filter selection
@@ -710,11 +725,11 @@ private async void GetActivity()
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error getting activity", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
-    private async void GetComments()
+    private async Task GetComments()
     {
       try
       {
@@ -729,7 +744,7 @@ private async void GetComments()
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error getting comments", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
@@ -774,51 +789,174 @@ private void UpdateStreamState()
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error updating state", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
-    private async void GetCommits()
+    private async Task GetBranches()
+    {
+      var prevBranchName = SelectedBranch != null ? SelectedBranch.Branch.name : StreamState.BranchName;
+      Branches = await Client.StreamGetBranches(Stream.id, 100, 0);
+
+      var index = Branches.FindIndex(x => x.name == prevBranchName);
+      if (index != -1)
+        SelectedBranch = BranchesViewModel[index];
+      else
+        SelectedBranch = BranchesViewModel[0];
+
+    }
+    private async Task GetCommits()
     {
       try
       {
-        if (SelectedBranch.Branch.commits == null || SelectedBranch.Branch.commits.totalCount > 0)
+        var prevCommitId = SelectedCommit != null ? SelectedCommit.id : StreamState.CommitId;
+        var branch = await Client.BranchGet(Stream.id, SelectedBranch.Branch.name, 100);
+        if (branch != null && branch.commits.items.Any())
         {
-          var branch = await Client.BranchGet(Stream.id, SelectedBranch.Branch.name, 100);
           branch.commits.items.Insert(0, new Commit { id = "latest", message = "Always receive the latest commit sent to this branch." });
           Commits = branch.commits.items;
-          var commit = Commits.FirstOrDefault(x => x.id == StreamState.CommitId);
+
+          var commit = Commits.FirstOrDefault(x => x.id == prevCommitId);
           if (commit != null)
             SelectedCommit = commit;
           else
             SelectedCommit = Commits[0];
         }
+
         else
         {
           SelectedCommit = null;
           Commits = new List<Commit>();
-          SelectedCommit = null;
         }
       }
       catch (Exception ex)
       {
+        new SpeckleException("Error getting commits", ex, true, Sentry.SentryLevel.Error);
+      }
+    }
+
+
+    #region subscriptions
+    private void Subscribe()
+    {
+      Client.SubscribeCommitCreated(StreamState.StreamId);
+      Client.SubscribeCommitUpdated(StreamState.StreamId);
+      Client.SubscribeCommitDeleted(StreamState.StreamId);
+      Client.OnCommitCreated += Client_OnCommitCreated;
+      Client.OnCommitUpdated += Client_OnCommitChange;
+      Client.OnCommitDeleted += Client_OnCommitChange;
+
+      Client.SubscribeBranchCreated(StreamState.StreamId);
+      Client.SubscribeBranchUpdated(StreamState.StreamId);
+      Client.SubscribeBranchDeleted(StreamState.StreamId);
+      Client.OnBranchCreated += Client_OnBranchChange;
+      Client.OnBranchUpdated += Client_OnBranchChange;
+      Client.OnBranchDeleted += Client_OnBranchChange;
+
+      Client.SubscribeCommentActivity(StreamState.StreamId);
+      Client.OnCommentActivity += Client_OnCommentActivity;
+
+      Client.SubscribeStreamUpdated(StreamState.StreamId);
+      Client.OnStreamUpdated += Client_OnStreamUpdated;
+    }
+
+    private async void Client_OnCommentActivity(object sender, CommentItem e)
+    {
+      await GetComments();
 
+      var authorName = "you";
+      if (e.authorId != Client.Account.userInfo.id)
+      {
+        var author = await Client.OtherUserGet(e.id);
+        authorName = author.name;
       }
+
+      bool openStream = true;
+      var svm = MainViewModel.RouterInstance.NavigationStack.Last() as StreamViewModel;
+      if (svm != null && svm.Stream.id == Stream.id)
+        openStream = false;
+
+      Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+      {
+        MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+        {
+          Title = $"🆕 New comment by {authorName}:",
+          Message = e.rawText,
+          OnClick = () =>
+          {
+            if (openStream)
+              MainViewModel.RouterInstance.Navigate.Execute(this);
+
+            SelectedTab = 3;
+          }
+          ,
+          Type = Avalonia.Controls.Notifications.NotificationType.Success,
+          Expiration = TimeSpan.FromSeconds(15)
+        });
+      });
+    }
+
+    private async void Client_OnBranchChange(object sender, Speckle.Core.Api.SubscriptionModels.BranchInfo info)
+    {
+      if (!_isAddingBranches)
+        await GetBranches();
+    }
+
+
+    private async void Client_OnCommitChange(object sender, Speckle.Core.Api.SubscriptionModels.CommitInfo info)
+    {
+      if (info.branchName == SelectedBranch.Branch.name)
+        await GetCommits();
     }
 
     private async void Client_OnCommitCreated(object sender, Speckle.Core.Api.SubscriptionModels.CommitInfo info)
     {
       try
       {
-        var branches = await Client.StreamGetBranches(StreamState.StreamId);
+
+
+        if (info.branchName == SelectedBranch.Branch.name)
+          await GetCommits();
 
         if (!IsReceiver) return;
 
-        var binfo = branches.FirstOrDefault(b => b.name == info.branchName);
-        var cinfo = binfo.commits.items.FirstOrDefault(c => c.id == info.id);
+        var authorName = "You";
+        if (info.authorId != Client.Account.userInfo.id)
+        {
+          var author = await Client.OtherUserGet(info.id);
+          authorName = author.name;
+        }
+
+        bool openOnline = false;
+
+        //if in stream edit open online
+        var svm = MainViewModel.RouterInstance.NavigationStack.Last() as StreamViewModel;
+        if (svm != null && svm.Stream.id == Stream.id)
+          openOnline = true;
+
+
+        Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+        {
+          MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+          {
+            Title = $"🆕 {authorName} sent to {Stream.name}/{info.branchName}'",
+            Message = openOnline ? "Click to view it online" : "Click open the stream",
+            OnClick = () =>
+            {
+              //if in stream edit open online
+              if (openOnline)
+                ViewOnlineSavedStreamCommand();
+              //if on home, open stream
+              else
+                MainViewModel.RouterInstance.Navigate.Execute(this);
+
+            }
+            ,
+            Type = Avalonia.Controls.Notifications.NotificationType.Success,
+            Expiration = TimeSpan.FromSeconds(10)
+          });
+        });
 
-        Notification = $"{cinfo.authorName} sent to {info.branchName}: {info.message}";
-        NotificationUrl = $"{StreamState.ServerUrl}/streams/{StreamState.StreamId}/commits/{cinfo.id}";
         ScrollToBottom();
 
         if (AutoReceive)
@@ -830,42 +968,65 @@ private async void Client_OnCommitCreated(object sender, Speckle.Core.Api.Subscr
       }
     }
 
-    public void DownloadImage(string url)
+    private void Client_OnStreamUpdated(object sender, Speckle.Core.Api.SubscriptionModels.StreamInfo e)
+    {
+      GetStream().ConfigureAwait(false);
+    }
+
+    #endregion
+
+    public async Task DownloadImage(string url)
     {
       try
       {
-        using (WebClient client = new WebClient())
-        {
-          client.Headers.Set("Authorization", "Bearer " + Client.ApiToken);
-          client.DownloadDataAsync(new Uri(url));
-          client.DownloadDataCompleted += DownloadComplete;
-        }
+
+        using var httpClient = new HttpClient();
+        httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {Client.ApiToken}");
+        var result = await httpClient.GetAsync(url);
+
+
+        byte[] bytes = await result.Content.ReadAsByteArrayAsync();
+
+        System.IO.Stream stream = new MemoryStream(bytes);
+
+        _previewImage = new Bitmap(stream);
+        this.RaisePropertyChanged(nameof(PreviewImage));
+
       }
       catch (Exception ex)
       {
-
+        System.Diagnostics.Debug.WriteLine(ex);
+        _previewImage = null; // Could not download...
       }
     }
 
-    private void DownloadComplete(object sender, DownloadDataCompletedEventArgs e)
+    //could not find a simple way to use a single method
+    public async Task DownloadImage360(string url)
     {
       try
       {
-        byte[] bytes = e.Result;
+
+        using var httpClient = new HttpClient();
+        httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {Client.ApiToken}");
+        var result = await httpClient.GetAsync(url);
+
+
+        byte[] bytes = await result.Content.ReadAsByteArrayAsync();
 
         System.IO.Stream stream = new MemoryStream(bytes);
 
-        var image = new Avalonia.Media.Imaging.Bitmap(stream);
-        _previewImage = image;
-        this.RaisePropertyChanged("PreviewImage");
+        _previewImage360 = new Bitmap(stream);
+        this.RaisePropertyChanged(nameof(PreviewImage360));
+
       }
       catch (Exception ex)
       {
         System.Diagnostics.Debug.WriteLine(ex);
-        PreviewImageUrl = null; // Could not download...
+        _previewImage360 = null; // Could not download...
       }
     }
 
+
     #region commands
 
     private async void AddNewBranch()
@@ -880,11 +1041,9 @@ private async void AddNewBranch()
       {
         try
         {
-
+          _isAddingBranches = true;
           var branchId = await StreamState.Client.BranchCreate(new BranchCreateInput { streamId = Stream.id, description = nbvm.Description ?? "", name = nbvm.BranchName });
-
-
-          Branches = await Client.StreamGetBranches(Stream.id, 100, 0);
+          await GetBranches();
 
           var index = Branches.FindIndex(x => x.name == nbvm.BranchName);
           if (index != -1)
@@ -896,7 +1055,13 @@ private async void AddNewBranch()
         catch (Exception e)
         {
           Dialogs.ShowDialog("Something went wrong...", e.Message, Material.Dialog.Icons.DialogIconKind.Error);
+          new SpeckleException("Error creating branch", e, true, Sentry.SentryLevel.Error);
+        }
+        finally
+        {
+          _isAddingBranches = false;
         }
+
       }
       else
       {
@@ -917,6 +1082,7 @@ public void ClearSearchCommand()
       SearchQuery = "";
     }
 
+
     public void ShareCommand()
     {
       MainViewModel.RouterInstance.Navigate.Execute(new CollaboratorsViewModel(HostScreen, this));
@@ -924,25 +1090,6 @@ public void ShareCommand()
       Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Share Open" } });
     }
 
-    public void CloseNotificationCommand(bool track = true)
-    {
-      Notification = "";
-      NotificationUrl = "";
-
-      if (track)
-        Analytics.TrackEvent(StreamState.Client.Account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Notification Dismiss" } });
-    }
-
-    public void LaunchNotificationCommand()
-    {
-      Analytics.TrackEvent(StreamState.Client.Account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Notification Click" } });
-
-      if (!string.IsNullOrEmpty(NotificationUrl))
-        Process.Start(new ProcessStartInfo(NotificationUrl) { UseShellExecute = true });
-
-      CloseNotificationCommand(false);
-    }
-
     public void EditSavedStreamCommand()
     {
       MainViewModel.RouterInstance.Navigate.Execute(this);
@@ -953,11 +1100,17 @@ public async void ViewOnlineSavedStreamCommand()
     {
       //ensure click transition has finished
       await Task.Delay(100);
-      //to open urls in .net core must set UseShellExecute = true
-      Process.Start(new ProcessStartInfo(Url) { UseShellExecute = true });
+
+      OpenUrl(Url);
       Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Stream View" } });
     }
 
+    private void OpenUrl(string url)
+    {
+      //to open urls in .net core must set UseShellExecute = true
+      Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+    }
+
     public async void CopyStreamURLCommand()
     {
       //ensure click transition has finished
@@ -970,13 +1123,25 @@ public async void SendCommand()
     {
       try
       {
-        SuccessfulSend = true;
         UpdateStreamState();
 
         HomeViewModel.Instance.AddSavedStream(this); //save the stream as well
 
         Reset();
 
+        if (!await Helpers.UserHasInternet())
+        {
+          Dispatcher.UIThread.Post(() =>
+            MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+            {
+              Title = "⚠️ Oh no!",
+              Message = "Could not reach the internet, are you connected?",
+              Type = Avalonia.Controls.Notifications.NotificationType.Error
+            }), DispatcherPriority.Background);
+
+          return;
+        }
+
         Progress.IsProgressing = true;
         var commitId = await Task.Run(() => Bindings.SendStream(StreamState, Progress));
         Progress.IsProgressing = false;
@@ -996,13 +1161,23 @@ public async void SendCommand()
             { "savedStreams", HomeViewModel.Instance.SavedStreams?.Count },
           });
 
-          Notification = $"Sent successfully, view online";
-          NotificationUrl = $"{StreamState.ServerUrl}/streams/{StreamState.StreamId}/commits/{commitId}";
-          SuccessfulSend = true;
+          MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+          {
+            Title = "👌 Data sent",
+            Message = $"Sent to '{Stream.name}', view it online",
+            OnClick = () => OpenUrl($"{StreamState.ServerUrl}/streams/{StreamState.StreamId}/commits/{commitId}"),
+            Type = Avalonia.Controls.Notifications.NotificationType.Success,
+            Expiration = TimeSpan.FromSeconds(10)
+          });
         }
         else
         {
-          Notification = "Nothing sent!";
+          MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+          {
+            Title = "😖 Send Error",
+            Message = $"Something went wrong",
+            Type = Avalonia.Controls.Notifications.NotificationType.Error
+          });
         }
 
         GetActivity();
@@ -1010,7 +1185,7 @@ public async void SendCommand()
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error sending", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
@@ -1040,7 +1215,7 @@ public async void PreviewCommand()
         }
         catch (Exception ex)
         {
-
+          new SpeckleException("Error preview", ex, true, Sentry.SentryLevel.Error);
         }
       }
       else
@@ -1059,6 +1234,21 @@ public async void ReceiveCommand()
         HomeViewModel.Instance.AddSavedStream(this);
 
         Reset();
+
+        if (!await Helpers.UserHasInternet())
+        {
+          Dispatcher.UIThread.Post(() =>
+            MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+            {
+              Title = "⚠️ Oh no!",
+              Message = "Could not reach the internet, are you connected?",
+              Type = Avalonia.Controls.Notifications.NotificationType.Error
+            }), DispatcherPriority.Background);
+
+          return;
+        }
+
+
         Progress.IsProgressing = true;
         var state = await Task.Run(() => Bindings.ReceiveStream(StreamState, Progress));
         Progress.IsProgressing = false;
@@ -1089,14 +1279,12 @@ public async void ReceiveCommand()
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error receiving", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
     private void Reset()
     {
-      Notification = "";
-      NotificationUrl = "";
       Progress = new ProgressViewModel();
     }
 
@@ -1106,7 +1294,13 @@ public void CancelSendOrReceiveCommand()
       Reset();
       string cancelledEvent = IsReceiver ? "Cancel Receive" : "Cancel Send";
       Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", cancelledEvent } });
-      Notification = IsReceiver ? "Cancelled Receive" : "Cancelled Send";
+
+      MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+      {
+        Title = "❌ Operation cancelled",
+        Message = IsReceiver ? "Nothing was received" : "Nothing was sent",
+        Type = Avalonia.Controls.Notifications.NotificationType.Success
+      });
     }
 
     public void CancelPreviewCommand()
@@ -1130,10 +1324,17 @@ private void SaveCommand()
           Analytics.TrackEvent(Client.Account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Stream Receiver Add" } });
         else
           Analytics.TrackEvent(Client.Account, Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Stream Sender Add" } });
+
+        MainUserControl.NotificationManager.Show(new PopUpNotificationViewModel()
+        {
+          Title = "💾 Stream Saved",
+          Message = "This stream has been saved to this file",
+          Type = Avalonia.Controls.Notifications.NotificationType.Success
+        });
       }
       catch (Exception ex)
       {
-
+        new SpeckleException("Error saving", ex, true, Sentry.SentryLevel.Error);
       }
     }
 
@@ -1219,6 +1420,11 @@ private bool IsReady()
 
       return true;
     }
+
+    public void Dispose()
+    {
+      Client.Dispose();
+    }
     #endregion
 
   }
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/AddCollaborators.xaml b/DesktopUI2/DesktopUI2/Views/Controls/CollaboratorsControl.xaml
similarity index 58%
rename from DesktopUI2/DesktopUI2/Views/Pages/ShareControls/AddCollaborators.xaml
rename to DesktopUI2/DesktopUI2/Views/Controls/CollaboratorsControl.xaml
index 1bb5242b6c..a12f71a7d5 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/AddCollaborators.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/CollaboratorsControl.xaml
@@ -1,24 +1,39 @@
-<UserControl
-  x:Class="DesktopUI2.Views.Pages.ShareControls.AddCollaborators"
+<UserControl
+  x:Class="DesktopUI2.Views.Controls.CollaboratorsControl"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  xmlns:p="clr-namespace:DesktopUI2.Views.Pages"
-  xmlns:reactiveUi="http://reactiveui.net"
-  xmlns:vm="using:DesktopUI2.ViewModels.DesignViewModels"
   d:DesignHeight="450"
   d:DesignWidth="800"
   mc:Ignorable="d">
-  <Grid Margin="15" RowDefinitions="auto, auto, auto, auto, *, auto">
+  <UserControl.Resources>
+    <conv:RoleValueConverter x:Key="RoleValueConverter" />
+    <conv:RoleCanShareValueConverter x:Key="RoleCanShareValueConverter" />
+    <conv:RoleCannotShareValueConverter x:Key="RoleCannotShareValueConverter" />
+  </UserControl.Resources>
+
+  <Grid RowDefinitions="auto, auto, auto, *, auto">
+    <TextBlock
+      Margin="5,0,0,0"
+      IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}}"
+      Text="Manage your collaborators or invite new ones by name or email:"
+      TextWrapping="Wrap" />
+
     <TextBlock
-      Margin="10"
-      Text="Share this model with anyone, anywhere 🌍"
+      Margin="5,0,0,0"
+      IsVisible="{Binding Role, Converter={StaticResource RoleCannotShareValueConverter}}"
+      Text="You don't have permission to manage collaborators on this stream."
       TextWrapping="Wrap" />
-    <Grid Grid.Row="1" Margin="0,10,0,0">
+
+    <Grid
+      Grid.Row="1"
+      Margin="0,15,0,0"
+      IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}}">
       <ComboBox
         Margin="8,19,8,0"
         Classes="Stealth"
@@ -28,23 +43,25 @@
         <ComboBox.ItemTemplate>
           <DataTemplate>
             <Grid ColumnDefinitions="auto,*">
+              <icons:MaterialIcon
+                Width="28"
+                Height="28"
+                Margin="0,0,5,0"
+                Foreground="DarkGray"
+                IsVisible="{Binding AvatarImage, Converter={x:Static ObjectConverters.IsNull}}"
+                Kind="Email" />
+
               <Image
                 Width="28"
                 Height="28"
-                IsVisible="{Binding AvatarUrl, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                IsVisible="{Binding AvatarImage, Converter={x:Static ObjectConverters.IsNotNull}}"
                 Source="{Binding AvatarImage}">
                 <Image.Clip>
                   <EllipseGeometry Rect="0,0,28,28" />
                 </Image.Clip>
               </Image>
 
-              <icons:MaterialIcon
-                Width="28"
-                Height="28"
-                Margin="0,0,5,0"
-                Foreground="DarkGray"
-                IsVisible="{Binding AvatarUrl, Converter={x:Static StringConverters.IsNullOrEmpty}}"
-                Kind="Email" />
+
               <TextBlock
                 Grid.Column="1"
                 Margin="5,0,0,0"
@@ -82,8 +99,9 @@
           </TextBox.InnerLeftContent>
         </TextBox>
       </m:Card>
-
     </Grid>
+
+
     <ProgressBar
       Grid.Row="2"
       Margin="12,5"
@@ -92,12 +110,11 @@
 
     <m:Card
       Grid.Row="3"
-      Margin="0,15"
+      Margin="0,15,0,0"
       VerticalAlignment="Stretch"
       HorizontalContentAlignment="Stretch"
-      Classes="Mini"
-      IsVisible="{Binding HasAddedUsers}">
-      <ScrollViewer MaxHeight="180" VerticalScrollBarVisibility="Auto">
+      Classes="Mini">
+      <ScrollViewer VerticalScrollBarVisibility="Auto">
         <ListBox
           x:Name="ItemsListBox"
           Margin="0"
@@ -107,7 +124,10 @@
           SelectionMode="Multiple, Toggle">
           <ListBox.ItemTemplate>
             <DataTemplate>
-              <Grid Margin="0" ColumnDefinitions="Auto,*">
+              <Grid
+                Margin="0"
+                ColumnDefinitions="Auto,*"
+                RowDefinitions="auto,auto">
 
                 <!--<Grid Margin="0" IsVisible="{Binding AvatarUrl, Converter={x:Static StringConverters.IsNullOrEmpty}}">
                   <Path
@@ -128,30 +148,54 @@
                 </Grid>-->
 
                 <icons:MaterialIcon
-                  Width="22"
-                  Height="22"
+                  Grid.RowSpan="2"
+                  Width="32"
+                  Height="32"
                   Margin="5,0,0,0"
                   Foreground="DarkGray"
-                  IsVisible="{Binding AvatarUrl, Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                  IsVisible="{Binding AvatarImage, Converter={x:Static ObjectConverters.IsNull}}"
                   Kind="Email" />
 
                 <Image
-                  Width="28"
-                  Height="28"
-                  IsVisible="{Binding AvatarUrl, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                  Grid.RowSpan="2"
+                  Width="38"
+                  Height="38"
+                  IsVisible="{Binding AvatarImage, Converter={x:Static ObjectConverters.IsNotNull}}"
                   Source="{Binding AvatarImage}">
 
                   <Image.Clip>
-                    <EllipseGeometry Rect="0,0,28,28" />
+                    <EllipseGeometry Rect="0,0,38,38" />
                   </Image.Clip>
                 </Image>
                 <TextBlock
                   Grid.Column="1"
-                  Margin="5,0,0,0"
-                  VerticalAlignment="Center"
+                  Margin="5,5,5,0"
+                  Padding="0"
+                  VerticalAlignment="Bottom"
                   Text="{Binding Name}"
                   TextTrimming="CharacterEllipsis" />
 
+                <TextBlock
+                  Grid.Row="1"
+                  Grid.Column="1"
+                  Margin="5,0,5,5"
+                  Padding="0"
+                  VerticalAlignment="Top"
+                  Classes="Overline"
+                  IsVisible="{Binding !Pending}"
+                  Text="{Binding Role, Converter={StaticResource RoleValueConverter}}"
+                  TextTrimming="CharacterEllipsis" />
+
+                <TextBlock
+                  Grid.Row="1"
+                  Grid.Column="1"
+                  Margin="5,0,5,5"
+                  Padding="0"
+                  VerticalAlignment="Top"
+                  Classes="Overline"
+                  IsVisible="{Binding Pending}"
+                  Text="Invited"
+                  TextTrimming="CharacterEllipsis" />
 
               </Grid>
 
@@ -166,18 +210,20 @@
 
 
     <StackPanel
-      Grid.Row="5"
+      Grid.Row="4"
       Grid.ColumnSpan="2"
       Margin="0,10,0,0"
       HorizontalAlignment="Right"
+      IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}}"
       Orientation="Horizontal"
-      Spacing="10">
+      Spacing="5">
+
       <Button
-        CornerRadius="25 "
         Classes="Flat"
         Command="{Binding RemoveSeletedUsersCommand}"
+        CornerRadius="25 "
         Foreground="Red"
-        IsVisible="{Binding HasSelectedUsers}"
+        IsEnabled="{Binding HasSelectedUsers}"
         ToolTip.Tip="Remove selected users and emails">
         <Grid Margin="0" ColumnDefinitions="auto,*">
 
@@ -191,13 +237,35 @@
             TextTrimming="CharacterEllipsis" />
         </Grid>
       </Button>
+      <Button
+        Classes="Flat"
+        Command="{Binding ChangeRoleSeletedUsersCommand}"
+        CornerRadius="25 "
+        IsEnabled="{Binding HasSelectedUsers}"
+        ToolTip.Tip="Change the role for the selected users">
+        <Grid Margin="0" ColumnDefinitions="auto,*">
 
+          <icons:MaterialIcon VerticalAlignment="Center" Kind="AccountCog" />
+          <TextBlock
+            Grid.Column="1"
+            Margin="8,0"
+            Padding="0"
+            VerticalAlignment="Center"
+            Text="Change role"
+            TextTrimming="CharacterEllipsis" />
+        </Grid>
+      </Button>
       <Button
+        Command="{Binding SaveCommand}"
+        Content="Save"
         CornerRadius="25 "
-        Command="{Binding ShareCommand}"
-        Content="Share"
-        IsEnabled="{Binding HasAddedUsers}"
-        ToolTip.Tip="Share the current entire model via Speckle with the selected people" />
+        ToolTip.Tip="Save your changes and invite the new collaborators" />
+      <Button
+        Command="{Binding CloseCommand}"
+        Content="Close"
+        CornerRadius="25 "
+        IsVisible="{Binding IsDialog}" />
     </StackPanel>
   </Grid>
+
 </UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/CollaboratorsControl.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/CollaboratorsControl.xaml.cs
new file mode 100644
index 0000000000..269747e109
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Controls/CollaboratorsControl.xaml.cs
@@ -0,0 +1,15 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace DesktopUI2.Views.Controls
+{
+  public partial class CollaboratorsControl : UserControl
+  {
+    public static CollaboratorsControl Instance { get; private set; }
+    public CollaboratorsControl()
+    {
+      AvaloniaXamlLoader.Load(this);
+      Instance = this;
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/ReceiveButton.xaml b/DesktopUI2/DesktopUI2/Views/Controls/ReceiveButton.xaml
deleted file mode 100644
index 98ec7cf11c..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Controls/ReceiveButton.xaml
+++ /dev/null
@@ -1,74 +0,0 @@
-<UserControl
-  x:Class="DesktopUI2.Views.Controls.ReceiveButton"
-  xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  mc:Ignorable="d">
-  <UserControl.Styles>
-    <Style Selector="icons|MaterialIcon#receive">
-      <Setter Property="RenderTransform" Value="rotate(30deg) scaleX(-1)" />
-    </Style>
-    <Style Selector="m|FloatingButton:pointerover icons|MaterialIcon#receive">
-      <Setter Property="RenderTransform" Value="rotate(15deg) scaleX(-1)" />
-    </Style>
-  </UserControl.Styles>
-  <Grid Margin="4">
-    <m:FloatingButton
-      VerticalAlignment="Center"
-      Command="{Binding ReceiveCommand}"
-      IsDefault="True"
-      IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}}"
-      ToolTip.Tip="Receive from this stream and saves it">
-      <Button.Content>
-        <icons:MaterialIcon
-          Name="receive"
-          Width="20"
-          Height="20"
-          Foreground="White"
-          Kind="CubeSend"
-          ToolTip.Tip="Receive">
-          <icons:MaterialIcon.Transitions>
-            <Transitions>
-              <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" />
-            </Transitions>
-          </icons:MaterialIcon.Transitions>
-
-        </icons:MaterialIcon>
-
-      </Button.Content>
-    </m:FloatingButton>
-
-    <Grid>
-      <ProgressBar
-        Width="40"
-        Height="40"
-        Classes="Circle"
-        IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}"
-        IsIndeterminate="{Binding Progress.IsIndeterminate, FallbackValue=True}"
-        IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}"
-        Maximum="{Binding Progress.Max}"
-        Value="{Binding Progress.Value}" />
-      <m:FloatingButton
-        assists:ButtonAssist.HoverColor="Transparent"
-        assists:ShadowAssist.ShadowDepth="0"
-        Background="Transparent"
-        Classes="Mini"
-        Command="{Binding CancelSendOrReceiveCommand}"
-        IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}"
-        IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}"
-        ToolTip.Tip="Cancel">
-        <Button.Content>
-          <icons:MaterialIcon
-            Width="15"
-            Height="15"
-            Foreground="{DynamicResource PrimaryHueDarkBrush}"
-            Kind="Close" />
-        </Button.Content>
-      </m:FloatingButton>
-    </Grid>
-  </Grid>
-</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/ReceiveButton.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/ReceiveButton.xaml.cs
deleted file mode 100644
index a9c1970f43..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Controls/ReceiveButton.xaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace DesktopUI2.Views.Controls
-{
-  public partial class ReceiveButton : UserControl
-  {
-    public ReceiveButton()
-    {
-      InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-      AvaloniaXamlLoader.Load(this);
-    }
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/HomeControls/SavedStreams.xaml b/DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml
similarity index 81%
rename from DesktopUI2/DesktopUI2/Views/Pages/HomeControls/SavedStreams.xaml
rename to DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml
index 5d320cb910..e43f12f5cc 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/HomeControls/SavedStreams.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml
@@ -1,5 +1,5 @@
 <UserControl
-  x:Class="DesktopUI2.Views.Pages.HomeControls.SavedStreams"
+  x:Class="DesktopUI2.Views.Controls.SavedStreams"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:ap="clr-namespace:DesktopUI2.Views.AttachedProperties"
@@ -241,66 +241,12 @@
                   </m:FloatingButton>
 
                   <!--  RECEIVE BTN  -->
-                  <c:ReceiveButton IsVisible="{Binding IsReceiver}" />
+                  <Button Classes="Receive" IsVisible="{Binding IsReceiver}" />
                   <!--  SEND BTN  -->
-                  <c:SendButton IsVisible="{Binding !IsReceiver}" />
+                  <Button Classes="Send" IsVisible="{Binding !IsReceiver}" />
 
                 </StackPanel>
 
-                <Grid
-                  Grid.Row="1"
-                  Grid.ColumnSpan="2"
-                  RowDefinitions="auto,auto,auto">
-                  <!--  NOTIFICATION  -->
-                  <m:ColorZone
-                    Grid.Row="1"
-                    Margin="0,10,0,0"
-                    assists:ShadowAssist.ShadowDepth="Depth0"
-                    CornerRadius="25"
-                    IsVisible="{Binding ShowNotification}"
-                    Mode="PrimaryMid">
-                    <Grid ColumnDefinitions="*, auto">
-                      <Button
-                        Margin="0,0,3,0"
-                        VerticalAlignment="Center"
-                        Classes="Flat"
-                        Command="{Binding LaunchNotificationCommand}"
-                        CornerRadius="25,0,0,25"
-                        ToolTip.Tip="View online">
-                        <StackPanel Orientation="Horizontal">
-                          <TextBlock
-                            VerticalAlignment="Center"
-                            Classes="Overline"
-                            FontWeight="Medium"
-                            Foreground="White"
-                            Text="{Binding Notification}"
-                            TextWrapping="Wrap" />
-                          <icons:MaterialIcon
-                            Margin="5,0"
-                            VerticalAlignment="Center"
-                            Foreground="White"
-                            Kind="ExternalLink" />
-                        </StackPanel>
-                      </Button>
-                      <m:FloatingButton
-                        Grid.Column="1"
-                        VerticalAlignment="Center"
-                        Background="Transparent"
-                        Classes="Mini"
-                        Command="{Binding CloseNotificationCommand}"
-                        ToolTip.Tip="Close notification">
-                        <Button.Content>
-                          <icons:MaterialIcon
-                            Width="15"
-                            Height="15"
-                            Foreground="White"
-                            Kind="Close" />
-
-                        </Button.Content>
-                      </m:FloatingButton>
-                    </Grid>
-                  </m:ColorZone>
-                </Grid>
               </Grid>
             </Button>
 
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/HomeControls/SavedStreams.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml.cs
similarity index 86%
rename from DesktopUI2/DesktopUI2/Views/Pages/HomeControls/SavedStreams.xaml.cs
rename to DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml.cs
index 0ed4fcc4fc..c85bce40c2 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/HomeControls/SavedStreams.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DesktopUI2.Views.Pages.HomeControls
+namespace DesktopUI2.Views.Controls
 {
   public partial class SavedStreams : UserControl
   {
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/SendButton.xaml b/DesktopUI2/DesktopUI2/Views/Controls/SendButton.xaml
deleted file mode 100644
index 136fb3d0fe..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Controls/SendButton.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<UserControl
-  x:Class="DesktopUI2.Views.Controls.SendButton"
-  xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  mc:Ignorable="d">
-  <UserControl.Styles>
-    <Style Selector="icons|MaterialIcon#send">
-      <Setter Property="RenderTransform" Value="rotate(-30deg)" />
-    </Style>
-    <Style Selector="m|FloatingButton:pointerover icons|MaterialIcon#send">
-      <Setter Property="RenderTransform" Value="rotate(-45deg)" />
-    </Style>
-  </UserControl.Styles>
-  <Grid Margin="4">
-    <m:FloatingButton
-      VerticalAlignment="Center"
-      Command="{Binding SendCommand, FallbackValue={x:Null}}"
-      IsDefault="True"
-      IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}, FallbackValue=True}"
-      ToolTip.Tip="Send to this stream and saves it">
-      <Button.Content>
-        <icons:MaterialIcon
-          Name="send"
-          Width="20"
-          Height="20"
-          Foreground="White"
-          Kind="CubeSend">
-          <icons:MaterialIcon.Transitions>
-            <Transitions>
-              <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" />
-            </Transitions>
-          </icons:MaterialIcon.Transitions>
-        </icons:MaterialIcon>
-      </Button.Content>
-    </m:FloatingButton>
-
-    <Grid>
-      <ProgressBar
-        Width="40"
-        Height="40"
-        Classes="Circle"
-        IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}"
-        IsIndeterminate="{Binding Progress.IsIndeterminate, FallbackValue=True}"
-        IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}"
-        Maximum="{Binding Progress.Max}"
-        Value="{Binding Progress.Value}" />
-      <m:FloatingButton
-        assists:ButtonAssist.HoverColor="Transparent"
-        assists:ShadowAssist.ShadowDepth="0"
-        Background="Transparent"
-        Classes="Mini"
-        Command="{Binding CancelSendOrReceiveCommand}"
-        IsEnabled="{Binding !Progress.IsPreviewProgressing, FallbackValue=True}"
-        IsVisible="{Binding Progress.IsProgressing, FallbackValue=False}"
-        ToolTip.Tip="Cancel">
-        <Button.Content>
-          <icons:MaterialIcon
-            Width="15"
-            Height="15"
-            Foreground="{DynamicResource PrimaryHueDarkBrush}"
-            Kind="Close" />
-        </Button.Content>
-      </m:FloatingButton>
-    </Grid>
-  </Grid>
-</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/SendButton.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/SendButton.xaml.cs
deleted file mode 100644
index ae95da8e57..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Controls/SendButton.xaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace DesktopUI2.Views.Controls
-{
-  public partial class SendButton : UserControl
-  {
-    public SendButton()
-    {
-      InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-      AvaloniaXamlLoader.Load(this);
-    }
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/SharedControls/StreamDetails.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamDetails.xaml
similarity index 97%
rename from DesktopUI2/DesktopUI2/Views/Pages/SharedControls/StreamDetails.xaml
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamDetails.xaml
index b3c9a1d9a4..8b32eaaedc 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/SharedControls/StreamDetails.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamDetails.xaml
@@ -1,5 +1,5 @@
 <UserControl
-  x:Class="DesktopUI2.Views.Pages.SharedControls.StreamDetails"
+  x:Class="DesktopUI2.Views.Controls.StreamDetails"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/SharedControls/StreamDetails.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/StreamDetails.xaml.cs
similarity index 85%
rename from DesktopUI2/DesktopUI2/Views/Pages/SharedControls/StreamDetails.xaml.cs
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamDetails.xaml.cs
index 562c7346fb..577cb0192f 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/SharedControls/StreamDetails.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamDetails.xaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DesktopUI2.Views.Pages.SharedControls
+namespace DesktopUI2.Views.Controls
 {
   public partial class StreamDetails : UserControl
   {
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Activity.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Activity.xaml
similarity index 97%
rename from DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Activity.xaml
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Activity.xaml
index 4709a64df4..a0e40a267d 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Activity.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Activity.xaml
@@ -1,5 +1,5 @@
 <UserControl
-  x:Class="DesktopUI2.Views.Pages.StreamEditControls.Activity"
+  x:Class="DesktopUI2.Views.Controls.StreamEditControls.Activity"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Activity.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Activity.xaml.cs
similarity index 83%
rename from DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Activity.xaml.cs
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Activity.xaml.cs
index 60a9be2ef0..d512b1e84b 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Activity.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Activity.xaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DesktopUI2.Views.Pages.StreamEditControls
+namespace DesktopUI2.Views.Controls.StreamEditControls
 {
   public partial class Activity : UserControl
   {
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Comments.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml
similarity index 78%
rename from DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Comments.xaml
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml
index 701a9e37cb..ec534f9b69 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Comments.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml
@@ -1,20 +1,19 @@
 <UserControl
-  x:Class="DesktopUI2.Views.Pages.StreamEditControls.Comments"
+  x:Class="DesktopUI2.Views.Controls.StreamEditControls.Comments"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
   xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:local="clr-namespace:DesktopUI2.Views.Pages"
   xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   xmlns:viewModels="clr-namespace:DesktopUI2.ViewModels.DesignViewModels"
   d:DesignHeight="450"
   d:DesignWidth="500"
   mc:Ignorable="d">
-  <Design.DataContext>
-    <viewModels:DesignSavedStreamViewModel />
-  </Design.DataContext>
+
 
   <UserControl.Resources>
     <conv:RoleCanSendValueConverter x:Key="RoleCanSendValueConverter" />
@@ -39,6 +38,7 @@
         <ItemsControl.ItemTemplate>
           <DataTemplate>
             <Expander
+              Margin="0,2"
               Padding="15,0"
               HorizontalAlignment="Stretch"
               HorizontalContentAlignment="Stretch"
@@ -79,11 +79,45 @@
 
               </Expander.Header>
               <!--  COMMENT BODY  -->
-              <Grid RowDefinitions="auto, auto, auto">
-                <Image Source="{Binding Screenshot^}" />
-                <ItemsControl
+              <Grid RowDefinitions="auto, auto, auto, auto">
+                <Image Margin="0,0,0,10" Source="{Binding Screenshot^}" />
+                <!--  VIEW  -->
+                <m:ColorZone
                   Grid.Row="1"
                   Margin="0,0,0,10"
+                  assists:ShadowAssist.ShadowDepth="Depth0"
+                  CornerRadius="25"
+                  IsVisible="{Binding $parent[local:StreamEditView].DataContext.CanOpenCommentsIn3DView}"
+                  Mode="PrimaryMid">
+                  <Button
+                    Margin="0,0,3,0"
+                    VerticalAlignment="Center"
+                    Classes="Flat"
+                    Command="{Binding OpenCommentView}"
+                    CornerRadius="25,0,0,25"
+                    ToolTip.Tip="Open this view in the curren software">
+                    <StackPanel Orientation="Horizontal">
+                      <TextBlock
+                        VerticalAlignment="Center"
+                        Classes="Overline"
+                        FontWeight="Medium"
+                        Foreground="White"
+                        Text="OPEN VIEW"
+                        TextWrapping="Wrap" />
+                      <icons:MaterialIcon
+                        Margin="5,0"
+                        VerticalAlignment="Center"
+                        Foreground="White"
+                        Kind="Camera" />
+                    </StackPanel>
+                  </Button>
+
+                </m:ColorZone>
+
+                <ItemsControl
+                  Grid.Row="2"
+                  Margin="0,0,0,10"
+                  IsVisible="{Binding Replies.Count}"
                   Items="{Binding Replies}">
                   <ItemsControl.ItemTemplate>
                     <DataTemplate>
@@ -121,7 +155,7 @@
                 </ItemsControl>
                 <!--  REPLY  -->
                 <m:ColorZone
-                  Grid.Row="2"
+                  Grid.Row="3"
                   Margin="0,0,0,10"
                   assists:ShadowAssist.ShadowDepth="Depth0"
                   CornerRadius="25"
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Comments.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml.cs
similarity index 82%
rename from DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Comments.xaml.cs
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml.cs
index df08d804ee..4670b87d61 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Comments.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DesktopUI2.Views.Pages.StreamEditControls
+namespace DesktopUI2.Views.Controls.StreamEditControls
 {
   public partial class Comments : UserControl
   {
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml
new file mode 100644
index 0000000000..55b5106572
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml
@@ -0,0 +1,265 @@
+<UserControl
+  x:Class="DesktopUI2.Views.Controls.StreamEditControls.Receive"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:viewModels="clr-namespace:DesktopUI2.ViewModels"
+  d:DesignHeight="650"
+  d:DesignWidth="400"
+  mc:Ignorable="d">
+  <UserControl.Styles>
+    <Style Selector="icons|MaterialIcon#receive">
+      <Setter Property="RenderTransform" Value="rotate(30deg) scaleX(-1)" />
+    </Style>
+    <Style Selector="m|FloatingButton:pointerover icons|MaterialIcon#receive">
+      <Setter Property="RenderTransform" Value="rotate(15deg) scaleX(-1)" />
+    </Style>
+  </UserControl.Styles>
+
+  <StackPanel Orientation="Vertical">
+    <Grid
+      Margin="15"
+      HorizontalAlignment="Stretch"
+      ColumnDefinitions="auto,*"
+      RowDefinitions="auto,auto">
+
+
+      <TextBlock
+        VerticalAlignment="Center"
+        Classes="SpeckleFont"
+        FontWeight="Bold"
+        Text="Model (branch):" />
+
+      <!--<icons:MaterialIcon
+        Margin="0"
+        VerticalAlignment="Center"
+        Foreground="Gray"
+        Kind="InfoCircle"
+        ToolTip.Tip="Data in a stream can be organized in branches,&#x0a;for instance, to have multiple design options&#x0a;or to store data by discipline.&#x0a;The default branch is called main." />-->
+      <ComboBox
+        Grid.Column="1"
+        Margin="5,10,5,10"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Center"
+        Items="{Binding BranchesViewModel}"
+        PlaceholderText="Select a model (branch)"
+        SelectedItem="{Binding SelectedBranch, Mode=TwoWay}">
+        <ComboBox.ItemsPanel />
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <Grid ColumnDefinitions="auto,*">
+              <!--<icons:MaterialIcon
+                Margin="0,0,5,0"
+                Foreground="DarkGray"
+                Kind="{Binding Icon}" />-->
+              <TextBlock
+                Grid.Column="1"
+                Text="{Binding Branch.name}"
+                TextTrimming="CharacterEllipsis" />
+            </Grid>
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+      <Expander
+        Grid.Row="1"
+        Grid.ColumnSpan="2"
+        HorizontalAlignment="Stretch"
+        HorizontalContentAlignment="Stretch"
+        Classes="Edit"
+        IsExpanded="{Binding IsExpanded}">
+        <Expander.Header>
+          <StackPanel Orientation="Horizontal">
+            <TextBlock
+              Classes="SpeckleFont"
+              FontWeight="Bold"
+              Text="Receive options " />
+          </StackPanel>
+        </Expander.Header>
+        <Grid
+          Margin="15,0"
+          ColumnDefinitions="auto,*, auto, *"
+          RowDefinitions="auto, auto,auto,auto">
+
+          <!--  SELECT COMMIT  -->
+          <icons:MaterialIcon
+            Grid.Column="2"
+            Margin="0"
+            VerticalAlignment="Center"
+            Foreground="Gray"
+            Kind="InfoCircle"
+            ToolTip.Tip="A commit is a snapshot in time&#x0a;of the data inside a branch.&#x0a;Every time you send to Speckle from a connector,&#x0a;a commit is created." />
+          <ComboBox
+            Grid.Column="3"
+            Margin="5,10,0,10"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Center"
+            IsEnabled="{Binding Commits.Count}"
+            Items="{Binding Commits}"
+            PlaceholderText="Select a commit"
+            SelectedIndex="0"
+            SelectedItem="{Binding SelectedCommit}">
+            <ComboBox.ItemTemplate>
+              <DataTemplate>
+                <Grid ColumnDefinitions="auto,auto,auto,*">
+
+                  <icons:MaterialIcon
+                    Margin="0,0,5,0"
+                    Foreground="DarkGray"
+                    Kind="SourceCommit" />
+                  <TextBlock
+                    Grid.Column="1"
+                    Text="{Binding id}"
+                    TextTrimming="CharacterEllipsis" />
+                  <TextBlock Grid.Column="2" Text=" | " />
+                  <TextBlock
+                    Grid.Column="3"
+                    Text="{Binding message}"
+                    TextTrimming="CharacterEllipsis" />
+                </Grid>
+              </DataTemplate>
+            </ComboBox.ItemTemplate>
+          </ComboBox>
+          <!--  RECEIVE MODE  -->
+          <icons:MaterialIcon
+            Grid.Row="0"
+            Margin="0"
+            VerticalAlignment="Center"
+            Foreground="Gray"
+            Kind="InfoCircle"
+            ToolTip.Tip="Decide what to do when an element being received already exists.&#x0a;UPDATE: attempts to update existing elements&#x0a;CREATE: always creates a new element&#x0a;IGNORE: skips already existing elements" />
+          <ComboBox
+            Grid.Row="0"
+            Grid.Column="1"
+            Margin="5,10,5,10"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Center"
+            Items="{Binding ReceiveModes}"
+            PlaceholderText="Select a receive mode"
+            SelectedItem="{Binding SelectedReceiveMode}" />
+          <!--  AUTO RECEIVE  -->
+          <icons:MaterialIcon
+            Grid.Row="1"
+            Grid.Column="0"
+            Margin="0"
+            VerticalAlignment="Center"
+            Foreground="Gray"
+            Kind="InfoCircle"
+            ToolTip.Tip="Automatically receive new data&#x0a;when it is sent to this branch.&#x0a;NOTE: use with caution!" />
+          <ToggleSwitch
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="5,10,0,10"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Center"
+            Content="Auto Receive"
+            IsChecked="{Binding AutoReceive}" />
+
+
+          <!--  ADVANCED SETTINGS  -->
+          <Button
+            Grid.Row="3"
+            Grid.ColumnSpan="4"
+            Margin="5"
+            HorizontalAlignment="Center"
+            HorizontalContentAlignment="Center"
+            assists:ShadowAssist.ShadowDepth="Depth0"
+            Background="Transparent"
+            Command="{Binding OpenSettingsCommand}"
+            Foreground="{DynamicResource PrimaryHueMidBrush}">
+            <Grid Margin="0" ColumnDefinitions="auto,*">
+              <icons:MaterialIcon VerticalAlignment="Center" Kind="Settings" />
+              <TextBlock
+                Grid.Column="1"
+                Margin="8,0"
+                Padding="0"
+                VerticalAlignment="Center"
+                Text="Advanced Settings"
+                TextTrimming="CharacterEllipsis" />
+            </Grid>
+          </Button>
+        </Grid>
+      </Expander>
+
+    </Grid>
+
+    <!--  NO COMMIT INFO  -->
+    <m:Card
+      Margin="10"
+      HorizontalContentAlignment="Stretch"
+      Classes="Mini">
+      <StackPanel>
+        <TextBlock
+          IsVisible="{Binding !Commits.Count}"
+          Text="This branch has no commits. Commits are generated what data is sent to a Stream.&#x0a;&#x0a;Please select a different branch or stream."
+          TextWrapping="Wrap" />
+        <!--  360 preview and hide logic in Receive.xaml.cs  -->
+        <Grid IsVisible="{Binding Commits.Count}">
+          <Image
+            x:Name="ImageBasic"
+            Height="200"
+            Source="{Binding PreviewImage}" />
+          <Viewbox
+            x:Name="PreviewBox360"
+            Height="200"
+            Stretch="UniformToFill">
+            <Image
+              x:Name="Image360"
+              Height="200"
+              Source="{Binding PreviewImage360}" />
+          </Viewbox>
+        </Grid>
+      </StackPanel>
+    </m:Card>
+    <!--  RECEIVE BTN  -->
+    <Button Margin="0,5,0,20" Classes="ReceiveFull" />
+    <Grid
+      Grid.Row="1"
+      Margin="15,5"
+      ColumnDefinitions="*,auto"
+      RowDefinitions="auto, auto,auto">
+
+
+
+
+
+      <StackPanel
+        Grid.Row="2"
+        Grid.Column="1"
+        HorizontalAlignment="Right"
+        Orientation="Horizontal"
+        Spacing="10">
+        <!--  SAVE BTN  -->
+        <m:FloatingButton
+          VerticalAlignment="Center"
+          assists:ShadowAssist.ShadowDepth="Depth0"
+          Background="Transparent"
+          Command="{Binding SaveCommand}"
+          IsEnabled="{Binding !Progress.IsProgressing}"
+          ToolTip.Tip="Save this sender to the file without sending">
+          <Button.Content>
+            <icons:MaterialIcon
+              Width="20"
+              Height="20"
+              assists:ShadowAssist.ShadowDepth="0"
+              Foreground="Gray"
+              Kind="ContentSave" />
+
+          </Button.Content>
+        </m:FloatingButton>
+
+        <!--  PREVIEW BTN  -->
+        <c:PreviewButton />
+
+
+      </StackPanel>
+    </Grid>
+
+
+  </StackPanel>
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml.cs
new file mode 100644
index 0000000000..29fa4945b9
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml.cs
@@ -0,0 +1,61 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using System;
+
+namespace DesktopUI2.Views.Controls.StreamEditControls
+{
+  public partial class Receive : UserControl
+  {
+    Viewbox PreviewBox360 { get; set; }
+    Image Image360 { get; set; }
+    Image ImageBasic { get; set; }
+    public Receive()
+    {
+      InitializeComponent();
+
+      PreviewBox360 = this.FindControl<Viewbox>("PreviewBox360");
+      Image360 = this.FindControl<Image>("Image360");
+      ImageBasic = this.FindControl<Image>("ImageBasic");
+
+
+
+      PreviewBox360.PointerMoved += PreviewBox360_PointerMoved;
+    }
+
+    private void PreviewBox360_PointerMoved(object sender, Avalonia.Input.PointerEventArgs e)
+    {
+      ImageBasic.IsVisible = false;
+      var mouseX = e.GetPosition(PreviewBox360).X + PreviewBox360.Margin.Left;
+      SetMargin(mouseX);
+    }
+
+    private void SetMargin(double mouseX)
+    {
+      if (mouseX == 0)
+        mouseX = 1;
+      var imageWidth = Image360.Bounds.Width == 0 ? 34300 : Image360.Bounds.Width; //34300
+      var imageStepWidth = imageWidth / 24.5; //1400 - WHY 24.5??? There seems to be some f* offset at the ends
+      var imageOffset = (imageWidth - (imageStepWidth * 24)) / 2;
+
+
+      var viewboxWidth = PreviewBox360.Bounds.Right;
+      var stepWidth = viewboxWidth / 24;
+
+
+      var index = Math.Abs(Math.Round(mouseX / stepWidth));
+      if (index >= 24)
+        index = 24 - 1;
+
+      var centerOffset = (imageStepWidth - viewboxWidth) / 2; //since the image fram is wider, let's center the model
+
+      var offset = (-1 * index * imageStepWidth) - imageOffset - centerOffset;
+      PreviewBox360.Margin = new Avalonia.Thickness(offset, 0, 0, 0);
+    }
+
+    private void InitializeComponent()
+    {
+      AvaloniaXamlLoader.Load(this);
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Report.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Report.xaml
similarity index 97%
rename from DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Report.xaml
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Report.xaml
index bcab8e01c0..2896b3ce11 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Report.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Report.xaml
@@ -1,5 +1,5 @@
 <UserControl
-  x:Class="DesktopUI2.Views.Pages.StreamEditControls.Report"
+  x:Class="DesktopUI2.Views.Controls.StreamEditControls.Report"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Report.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Report.xaml.cs
similarity index 83%
rename from DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Report.xaml.cs
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Report.xaml.cs
index 5b12f01bc2..365223027c 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Report.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Report.xaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DesktopUI2.Views.Pages.StreamEditControls
+namespace DesktopUI2.Views.Controls.StreamEditControls
 {
   public partial class Report : UserControl
   {
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml
new file mode 100644
index 0000000000..bf0287f18f
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml
@@ -0,0 +1,206 @@
+<UserControl
+  x:Class="DesktopUI2.Views.Controls.StreamEditControls.Send"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:viewModels="clr-namespace:DesktopUI2.ViewModels"
+  d:DesignHeight="450"
+  d:DesignWidth="400"
+  mc:Ignorable="d">
+  <UserControl.Styles>
+    <Style Selector="icons|MaterialIcon#send">
+      <Setter Property="RenderTransform" Value="rotate(-30deg)" />
+    </Style>
+    <Style Selector="m|FloatingButton:pointerover icons|MaterialIcon#send">
+      <Setter Property="RenderTransform" Value="rotate(-45deg)" />
+    </Style>
+  </UserControl.Styles>
+  <StackPanel Orientation="Vertical">
+    <Grid
+      Margin="15"
+      HorizontalAlignment="Stretch"
+      ColumnDefinitions="auto,*"
+      RowDefinitions="auto,auto">
+
+
+      <TextBlock
+        VerticalAlignment="Center"
+        Classes="SpeckleFont"
+        FontWeight="Bold"
+        Text="Model (branch):" />
+
+      <ComboBox
+        Grid.Column="1"
+        Margin="5,10,5,10"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Center"
+        Items="{Binding BranchesViewModel}"
+        PlaceholderText="Select a model (branch)"
+        SelectedItem="{Binding SelectedBranch, Mode=TwoWay}">
+        <ComboBox.ItemsPanel />
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <Grid ColumnDefinitions="auto,*">
+              <!--<icons:MaterialIcon
+                Margin="0,0,5,0"
+                Foreground="DarkGray"
+                Kind="{Binding Icon}" />-->
+              <TextBlock
+                Grid.Column="1"
+                Text="{Binding Branch.name}"
+                TextTrimming="CharacterEllipsis" />
+            </Grid>
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+
+
+      <!--  FILTER & SETTINGS  -->
+      <Expander
+        Grid.Row="1"
+        Grid.ColumnSpan="2"
+        HorizontalAlignment="Stretch"
+        HorizontalContentAlignment="Stretch"
+        Classes="Edit"
+        IsExpanded="{Binding IsExpanded}">
+        <Expander.Header>
+          <StackPanel Orientation="Horizontal">
+            <TextBlock
+              Grid.Row="1"
+              VerticalAlignment="Center"
+              Classes="SpeckleFont"
+              FontWeight="Bold"
+              Text="Selection: " />
+
+            <TextBlock
+              Grid.Row="1"
+              Grid.Column="1"
+              VerticalAlignment="Center"
+              Text="{Binding SelectedFilter.Summary}" />
+          </StackPanel>
+        </Expander.Header>
+
+        <StackPanel Orientation="Vertical">
+
+
+
+          <!--  SELECT FILTER  -->
+
+          <ComboBox
+            Name="FilterCombo"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Center"
+            Items="{Binding AvailableFilters}"
+            PlaceholderText="Select a filter"
+            SelectedIndex="0"
+            SelectedItem="{Binding SelectedFilter}">
+            <ComboBox.ItemTemplate>
+              <DataTemplate>
+                <Grid ColumnDefinitions="auto,*">
+                  <icons:MaterialIcon
+                    Margin="0,0,5,0"
+                    Foreground="DarkGray"
+                    Kind="{Binding Filter.Icon}" />
+                  <TextBlock
+                    Grid.Column="1"
+                    Text="{Binding Filter.Name}"
+                    TextTrimming="CharacterEllipsis" />
+                </Grid>
+              </DataTemplate>
+            </ComboBox.ItemTemplate>
+          </ComboBox>
+          <!--  FILTER INFO - the magic happens in FilterTemplateSelector.cs  -->
+          <Grid Margin="0,15">
+            <ContentControl Content="{Binding SelectedFilter}" />
+          </Grid>
+          <!--  ADVANCED SETTINGS  -->
+          <Button
+            Margin="5"
+            HorizontalAlignment="Center"
+            HorizontalContentAlignment="Center"
+            assists:ShadowAssist.ShadowDepth="Depth0"
+            Background="Transparent"
+            Command="{Binding OpenSettingsCommand}"
+            Foreground="{DynamicResource PrimaryHueMidBrush}">
+            <Grid Margin="0" ColumnDefinitions="auto,*">
+              <icons:MaterialIcon VerticalAlignment="Center" Kind="Settings" />
+              <TextBlock
+                Grid.Column="1"
+                Margin="8,0"
+                Padding="0"
+                VerticalAlignment="Center"
+                Text="Advanced Settings"
+                TextTrimming="CharacterEllipsis" />
+            </Grid>
+          </Button>
+
+        </StackPanel>
+
+      </Expander>
+    </Grid>
+
+    <!--  SEND BTN  -->
+    <Button Margin="0,5,0,20" Classes="SendFull" />
+
+
+    <!--  COMMIT AND OTHER BUTTONS  -->
+    <Grid
+      Grid.Row="1"
+      Margin="15,5"
+      ColumnDefinitions="*,auto"
+      RowDefinitions="auto">
+      <!--  COMMIT MESSAGE  -->
+      <TextBox
+        Margin="0,0,10,0"
+        Padding="0"
+        HorizontalAlignment="Stretch"
+        HorizontalContentAlignment="Stretch"
+        Classes="Filled Dense"
+        Foreground="Gray"
+        IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}}"
+        IsReadOnly="{Binding Progress.IsProgressing}"
+        Text="{Binding StreamState.CommitMessage}"
+        Watermark="Message (optional) " />
+      <StackPanel
+        Grid.Column="1"
+        HorizontalAlignment="Right"
+        Orientation="Horizontal"
+        Spacing="10">
+
+        <!--  SAVE BTN  -->
+        <m:FloatingButton
+          VerticalAlignment="Center"
+          assists:ShadowAssist.ShadowDepth="Depth0"
+          Background="Transparent"
+          Command="{Binding SaveCommand}"
+          IsEnabled="{Binding !Progress.IsProgressing}"
+          ToolTip.Tip="Save this sender to the file without sending">
+          <Button.Content>
+            <icons:MaterialIcon
+              Width="20"
+              Height="20"
+              assists:ShadowAssist.ShadowDepth="0"
+              Foreground="Gray"
+              Kind="ContentSave" />
+
+          </Button.Content>
+        </m:FloatingButton>
+
+        <!--  PREVIEW BTN  -->
+        <c:PreviewButton />
+
+
+      </StackPanel>
+    </Grid>
+
+
+
+  </StackPanel>
+
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Send.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml.cs
similarity index 83%
rename from DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Send.xaml.cs
rename to DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml.cs
index a6cd79ed4f..02e6da303c 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Send.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DesktopUI2.Views.Pages.StreamEditControls
+namespace DesktopUI2.Views.Controls.StreamEditControls
 {
   public partial class Send : UserControl
   {
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml
new file mode 100644
index 0000000000..16e84dea7f
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml
@@ -0,0 +1,169 @@
+<UserControl
+  x:Class="DesktopUI2.Views.Controls.StreamSelector"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  d:DesignHeight="450"
+  d:DesignWidth="400"
+  mc:Ignorable="d">
+
+  <Grid IsVisible="{Binding DialogVisible}" Opacity="{Binding DialogOpacity}">
+    <Grid.Transitions>
+      <Transitions>
+        <DoubleTransition Property="Opacity" Duration="0:0:0.3" />
+      </Transitions>
+    </Grid.Transitions>
+    <Border Background="{DynamicResource MaterialDesignCardBackground}" Opacity="0.8" />
+    <m:Card
+      MinHeight="100"
+      Margin="40"
+      Padding="0"
+      VerticalAlignment="Center"
+      assists:ShadowAssist.ShadowDepth="10">
+      <Grid RowDefinitions="auto,auto,auto,*,auto">
+        <TextBlock
+          Margin="15,15,15,0"
+          Classes="Subtitle1"
+          Text="Mapping Data Source"
+          TextTrimming="CharacterEllipsis" />
+
+        <TextBlock
+          Grid.Row="1"
+          Margin="15"
+          Foreground="Gray"
+          Text="Select a stream and branch coming from Revit with the Mapping Data"
+          TextWrapping="Wrap" />
+
+        <Expander
+          Grid.Row="2"
+          Margin="10,0"
+          Classes="Minimal"
+          Header="Instructions">
+          <Image Source="/Assets/mapping.png" />
+        </Expander>
+
+
+
+
+        <!--  BRANCH SELECTOR  -->
+        <m:Card
+          Grid.Row="3"
+          Margin="10"
+          IsVisible="{Binding StreamSelector.SelectedStream, Converter={x:Static ObjectConverters.IsNotNull}}">
+          <StackPanel Spacing="5">
+            <Grid>
+
+              <!--  SEARCH STREAMS  -->
+              <StackPanel Orientation="Vertical">
+                <TextBox
+                  Name="SearchBox"
+                  Margin="0"
+                  Padding="0"
+                  assists:TextFieldAssist.Label="Stream"
+                  Text="{Binding SearchQuery}"
+                  UseFloatingWatermark="True">
+                  <TextBox.InnerRightContent>
+                    <Button
+                      Width="{Binding $self.Bounds.Height}"
+                      Classes="Flat"
+                      Command="{Binding ClearSearchCommand}"
+                      Content="{icons:MaterialIconExt CloseCircle,
+                                                      Size=15}" />
+                  </TextBox.InnerRightContent>
+                </TextBox>
+
+                <ProgressBar
+                  Grid.Row="2"
+                  Margin="0,-3,0,0"
+                  IsIndeterminate="True"
+                  IsVisible="{Binding ShowProgress, FallbackValue=True}" />
+              </StackPanel>
+              <Popup
+                Width="{Binding #SearchBox.Bounds.Width}"
+                MaxHeight="300"
+                IsLightDismissEnabled="False"
+                IsOpen="{Binding #SearchBox.IsKeyboardFocusWithin}">
+
+                <m:Card Margin="0,0" CornerRadius="0">
+                  <StackPanel Orientation="Vertical">
+
+                    <ListBox
+                      Classes="no-ripple"
+                      Items="{Binding Streams}"
+                      SelectedItem="{Binding SelectedStream}"
+                      SelectionMode="Single">
+                      <ListBox.ItemTemplate>
+                        <DataTemplate>
+                          <Grid ColumnDefinitions="auto,*">
+                            <TextBlock
+                              Grid.Column="1"
+                              Margin="5,0,0,0"
+                              VerticalAlignment="Center"
+                              Text="{Binding Stream.name}"
+                              TextTrimming="CharacterEllipsis" />
+                          </Grid>
+                        </DataTemplate>
+                      </ListBox.ItemTemplate>
+                    </ListBox>
+                  </StackPanel>
+
+
+                </m:Card>
+              </Popup>
+
+
+            </Grid>
+
+            <ComboBox
+              HorizontalAlignment="Stretch"
+              VerticalAlignment="Center"
+              assists:ComboBoxAssist.Label="Branch"
+              Classes="Outline"
+              Items="{Binding Branches}"
+              PlaceholderText="Branch"
+              SelectedItem="{Binding SelectedBranch, Mode=TwoWay}">
+              <ComboBox.ItemTemplate>
+                <DataTemplate>
+                  <TextBlock
+                    Grid.Column="1"
+                    Text="{Binding name}"
+                    TextTrimming="CharacterEllipsis" />
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
+          </StackPanel>
+
+
+
+
+        </m:Card>
+        <StackPanel
+          Grid.Row="4"
+          Margin="15"
+          HorizontalAlignment="Right"
+          Orientation="Horizontal">
+          <Button
+            Margin="0,0,10,0"
+            Classes="Outline"
+            Command="{Binding CancelCommand}"
+            Content="Cancel" />
+          <Button
+            Margin="0,0,10,0"
+            Command="{Binding OkCommand}"
+            Content="OK"
+            IsEnabled="{Binding SelectedBranch, Converter={x:Static ObjectConverters.IsNotNull}}" />
+
+        </StackPanel>
+      </Grid>
+    </m:Card>
+  </Grid>
+
+
+
+
+
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml.cs b/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml.cs
new file mode 100644
index 0000000000..f0cb15d607
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml.cs
@@ -0,0 +1,13 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace DesktopUI2.Views.Controls
+{
+  public partial class StreamSelector : UserControl
+  {
+    public StreamSelector()
+    {
+      AvaloniaXamlLoader.Load(this);
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/Filters/ListFilterView.xaml b/DesktopUI2/DesktopUI2/Views/Filters/ListFilterView.xaml
index f8ec25c0e8..8b029739df 100644
--- a/DesktopUI2/DesktopUI2/Views/Filters/ListFilterView.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Filters/ListFilterView.xaml
@@ -50,13 +50,13 @@
         SelectionMode="Multiple, Toggle" />
     </ScrollViewer>
 
-    <TextBlock
+    <!--<TextBlock
       Grid.Row="3"
       Margin="0,20,0,8"
       FontSize="14"
       FontWeight="Medium"
       Text="Current selection:" />
-    <TextBlock Grid.Row="4" Text="{Binding Summary}" />
+    <TextBlock Grid.Row="4" Text="{Binding Summary}" />-->
 
   </Grid>
 </UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Filters/ManualFilterView.xaml b/DesktopUI2/DesktopUI2/Views/Filters/ManualFilterView.xaml
index 6e8a0e8b3b..864c065440 100644
--- a/DesktopUI2/DesktopUI2/Views/Filters/ManualFilterView.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Filters/ManualFilterView.xaml
@@ -23,11 +23,14 @@
   </UserControl.Styles>
   <StackPanel Margin="0,4" Spacing="10">
     <TextBlock Text="{Binding Filter.Description}" TextWrapping="Wrap" />
-    <StackPanel Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center">
+    <StackPanel
+      HorizontalAlignment="Center"
+      Orientation="Horizontal"
+      Spacing="10">
       <Button
+        Width="150"
         Background="{DynamicResource PrimaryHueMidBrush}"
         Classes="Outline"
-				Width="150"
         Command="{Binding SetObjectSelection}"
         Foreground="White"
         ToolTip.Tip="Sets the currently selected objects.">
@@ -60,9 +63,9 @@
     </Button>-->
 
       <Button
+        Width="150"
         BorderBrush="OrangeRed"
         Classes="Outline"
-				Width="150"
         Command="{Binding ClearObjectSelection}"
         Foreground="OrangeRed"
         ToolTip.Tip="Removes all selected objects.">
@@ -72,12 +75,12 @@
         </StackPanel>
       </Button>
     </StackPanel>
-    <TextBlock
+    <!--<TextBlock
       Margin="0,12,0,8"
       FontSize="14"
       FontWeight="Medium"
       Text="Current selection:" />
-    <TextBlock Text="{Binding Summary}" />
+    <TextBlock Text="{Binding Summary}" />-->
 
   </StackPanel>
 
diff --git a/DesktopUI2/DesktopUI2/Views/MainUserControl.xaml b/DesktopUI2/DesktopUI2/Views/MainUserControl.xaml
index 298c0df89d..0de7c07cc6 100644
--- a/DesktopUI2/DesktopUI2/Views/MainUserControl.xaml
+++ b/DesktopUI2/DesktopUI2/Views/MainUserControl.xaml
@@ -2,13 +2,16 @@
   x:Class="DesktopUI2.Views.MainUserControl"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:c="using:DesktopUI2.Views.Controls"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:mo="using:DesktopUI2.Models"
   xmlns:reactiveUi="http://reactiveui.net"
+  xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
   xmlns:vm="using:DesktopUI2.ViewModels"
-	xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
   d:DesignHeight="500"
-	xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
   d:DesignWidth="400"
   mc:Ignorable="d">
   <Design.DataContext>
@@ -22,31 +25,41 @@
       <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
       <Setter Property="TextBox.Foreground" Value="{DynamicResource MaterialDesignBody}" />
       <Setter Property="TextBox.FontWeight" Value="Medium" />
-			<Setter Property="TextBox.FontSize" Value="14" />
-		 </Style>
+      <Setter Property="TextBox.FontSize" Value="14" />
+    </Style>
   </UserControl.Styles>
   <ContentControl x:Name="MainUserControl">
     <Grid>
-      <reactiveUi:RoutedViewHost
-        Grid.Row="1"
-        Router="{Binding Router}">
+      <!--  ROUTER  -->
+      <reactiveUi:RoutedViewHost Grid.Row="1" Router="{Binding Router}">
         <reactiveUi:RoutedViewHost.PageTransition>
           <CrossFade Duration="0.15" />
         </reactiveUi:RoutedViewHost.PageTransition>
       </reactiveUi:RoutedViewHost>
-			<Grid Opacity="{Binding DialogOpacity}" IsVisible="{Binding DialogVisible}">
-				<Grid.Transitions>
-					<Transitions>
-						<DoubleTransition Property="Opacity" Duration="0:0:0.3"/>
-					</Transitions>
-				</Grid.Transitions>
-				<Border Background="{DynamicResource MaterialDesignCardBackground}"  Opacity="0.8"/>
-				<styles:Card assists:ShadowAssist.ShadowDepth="10"  Margin="40" MinHeight="100" Padding="0" VerticalAlignment="Center">
-					<ContentControl Content="{Binding DialogBody}" />
-				</styles:Card>
-		</Grid>
-			
+      <!--  DIALOG  -->
+      <Grid IsVisible="{Binding DialogVisible}" Opacity="{Binding DialogOpacity}">
+        <Grid.Transitions>
+          <Transitions>
+            <DoubleTransition Property="Opacity" Duration="0:0:0.3" />
+          </Transitions>
+        </Grid.Transitions>
+        <Border Background="{DynamicResource MaterialDesignCardBackground}" Opacity="0.8" />
+        <styles:Card
+          MinHeight="100"
+          Margin="40"
+          Padding="0"
+          VerticalAlignment="Center"
+          assists:ShadowAssist.ShadowDepth="10">
+          <ContentControl Content="{Binding DialogBody}" />
+        </styles:Card>
+      </Grid>
+      <!--  NOTIFICATION MANAGER  -->
+      <mo:NotificationManager
+        x:Name="NotificationManager"
+        Classes="BottomStretch"
+        CornerRadius="20"
+        MaxItems="3" />
     </Grid>
-	
+
   </ContentControl>
 </UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/MainUserControl.xaml.cs b/DesktopUI2/DesktopUI2/Views/MainUserControl.xaml.cs
index 1f153a5267..ef1674fd30 100644
--- a/DesktopUI2/DesktopUI2/Views/MainUserControl.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/MainUserControl.xaml.cs
@@ -1,5 +1,9 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
+using DesktopUI2.Models;
 using DesktopUI2.ViewModels;
 using ReactiveUI;
 using Speckle.Core.Logging;
@@ -9,12 +13,15 @@ namespace DesktopUI2.Views
 {
   public partial class MainUserControl : ReactiveUserControl<MainViewModel>
   {
+    public static NotificationManager NotificationManager;
     public MainUserControl()
     {
       this.WhenActivated(disposables => { });
       AvaloniaXamlLoader.Load(this);
 
       Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object>() { { "name", "Launched" } });
+
+      NotificationManager = this.FindControl<NotificationManager>("NotificationManager");
     }
   }
 }
diff --git a/DesktopUI2/DesktopUI2/Views/Mappings/Controls/RevitBasic.xaml b/DesktopUI2/DesktopUI2/Views/Mappings/Controls/RevitBasic.xaml
new file mode 100644
index 0000000000..a74b4f91fb
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Mappings/Controls/RevitBasic.xaml
@@ -0,0 +1,42 @@
+<UserControl
+  x:Class="DesktopUI2.Views.Mappings.Controls.RevitBasic"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  d:DesignHeight="450"
+  d:DesignWidth="800"
+  mc:Ignorable="d">
+  <StackPanel Orientation="Vertical" Spacing="5">
+
+    <ComboBox
+      assists:ComboBoxAssist.Label="Family"
+      Classes="Outline"
+      Items="{Binding Families}"
+      SelectedItem="{Binding SelectedFamily, Mode=TwoWay}">
+      <ComboBox.ItemTemplate>
+        <DataTemplate>
+          <TextBlock
+            Grid.Column="1"
+            Text="{Binding Name}"
+            TextTrimming="CharacterEllipsis" />
+        </DataTemplate>
+      </ComboBox.ItemTemplate>
+    </ComboBox>
+
+    <ComboBox
+      Grid.Row="1"
+      assists:ComboBoxAssist.Label="Type"
+      Classes="Outline"
+      Items="{Binding SelectedFamily.Types}"
+      SelectedItem="{Binding SelectedType, Mode=TwoWay}" />
+
+    <ComboBox
+      Grid.Row="1"
+      assists:ComboBoxAssist.Label="Base Level"
+      Classes="Outline"
+      Items="{Binding Levels}"
+      SelectedItem="{Binding SelectedLevel, Mode=TwoWay}" />
+  </StackPanel>
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Mappings/Controls/RevitBasic.xaml.cs b/DesktopUI2/DesktopUI2/Views/Mappings/Controls/RevitBasic.xaml.cs
new file mode 100644
index 0000000000..ce9a957a09
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Mappings/Controls/RevitBasic.xaml.cs
@@ -0,0 +1,13 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace DesktopUI2.Views.Mappings.Controls
+{
+  public partial class RevitBasic : UserControl
+  {
+    public RevitBasic()
+    {
+      AvaloniaXamlLoader.Load(this);
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml b/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml
new file mode 100644
index 0000000000..f3004462e8
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml
@@ -0,0 +1,338 @@
+<UserControl
+  x:Class="DesktopUI2.Views.MappingsControl"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
+  xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:dvm="clr-namespace:DesktopUI2.ViewModels.DesignViewModels"
+  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:local="clr-namespace:DesktopUI2.Views.Pages"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
+  xmlns:map="clr-namespace:DesktopUI2.Views.Mappings.Controls"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:ripple="clr-namespace:Material.Ripple;assembly=Material.Ripple"
+  xmlns:s="clr-namespace:DesktopUI2.ViewModels.MappingTool"
+  d:DesignHeight="650"
+  d:DesignWidth="400"
+  mc:Ignorable="d">
+  <UserControl.Styles>
+    <Style Selector="ContentControl#MappingsUserControl">
+      <Setter Property="FontSize" Value="14" />
+      <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
+      <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
+      <Setter Property="TextBox.Foreground" Value="{DynamicResource MaterialDesignBody}" />
+      <Setter Property="TextBox.FontWeight" Value="Medium" />
+      <Setter Property="TextBox.FontSize" Value="14" />
+    </Style>
+  </UserControl.Styles>
+  <ContentControl x:Name="MappingsUserControl">
+    <Grid>
+      <Grid RowDefinitions="auto, *">
+        <!--  HEADER  -->
+        <Border
+          Padding="10"
+          Background="{DynamicResource PrimaryHueMidBrush}"
+          CornerRadius="0">
+          <Grid ColumnDefinitions="auto,auto,*,auto,auto,auto,auto">
+
+            <Canvas
+              Grid.Column="0"
+              Width="109"
+              Height="30">
+              <Path Name="path280" Fill="#FFFFFFFF">
+                <Path.Data>
+                  <PathGeometry Figures="M108.934 -0l-108.868 6.02l0 23.98l108.868 -6.02l-0 -23.98Zm-89.08 12.484l0.09 -0.005l-2.404 -2.146l-11.594 0.636l-0 11.563l2.314 2.066l-0 0.08l0.085 -0.004l0.005 0.004l0 -0.005l11.504 -0.631l-0 -11.558Zm8.023 11.148c-1.043 0.057 -1.965 -0.079 -2.767 -0.408c-0.802 -0.329 -1.431 -0.835 -1.887 -1.518c-0.457 -0.683 -0.685 -1.536 -0.685 -2.558l0 -0.512l2.327 -0.128l0 0.511c0 0.905 0.274 1.565 0.822 1.98c0.547 0.416 1.277 0.598 2.19 0.548c0.926 -0.051 1.623 -0.28 2.092 -0.686c0.47 -0.406 0.704 -0.911 0.704 -1.514c0 -0.406 -0.11 -0.731 -0.332 -0.975c-0.222 -0.243 -0.544 -0.432 -0.968 -0.566c-0.424 -0.134 -0.935 -0.256 -1.535 -0.367l-0.587 -0.086c-0.899 -0.16 -1.678 -0.382 -2.337 -0.667c-0.658 -0.285 -1.163 -0.673 -1.515 -1.165c-0.352 -0.492 -0.528 -1.151 -0.528 -1.977c-0 -0.826 0.195 -1.545 0.586 -2.156c0.392 -0.612 0.946 -1.095 1.663 -1.449c0.717 -0.355 1.558 -0.558 2.522 -0.612c0.965 -0.053 1.826 0.063 2.582 0.349c0.756 0.286 1.352 0.745 1.789 1.376c0.437 0.632 0.655 1.439 0.655 2.422l0 0.649l-2.327 0.129l0 -0.649c0 -0.564 -0.111 -1.01 -0.332 -1.339c-0.222 -0.328 -0.535 -0.56 -0.939 -0.695c-0.404 -0.135 -0.88 -0.187 -1.428 -0.157c-0.808 0.045 -1.421 0.236 -1.838 0.574c-0.417 0.337 -0.626 0.795 -0.626 1.371c0 0.368 0.095 0.674 0.284 0.919c0.189 0.245 0.469 0.439 0.841 0.583c0.371 0.143 0.837 0.258 1.398 0.345l0.587 0.106c0.938 0.157 1.76 0.378 2.464 0.66c0.704 0.282 1.255 0.674 1.652 1.177c0.398 0.502 0.597 1.173 0.597 2.012c-0 0.826 -0.212 1.566 -0.636 2.218c-0.424 0.653 -1.017 1.178 -1.78 1.574c-0.762 0.396 -1.665 0.623 -2.708 0.681Zm7.177 -0.673l-0 -13.766l5.534 -0.306c0.861 -0.048 1.617 0.081 2.269 0.386c0.652 0.304 1.167 0.758 1.545 1.36c0.378 0.602 0.567 1.329 0.567 2.181l-0 0.275c-0 0.839 -0.193 1.584 -0.577 2.235c-0.385 0.65 -0.906 1.164 -1.565 1.542c-0.658 0.377 -1.404 0.589 -2.239 0.635l-3.168 0.175l0 5.153l-2.366 0.13Zm11.792 -0.652l0 -13.766l8.722 -0.483l-0 2.144l-6.356 0.352l0 3.618l5.808 -0.321l0 2.144l-5.808 0.321l0 3.717l6.454 -0.357l-0 2.144l-8.82 0.487Zm16.016 -0.61c-1.668 0.092 -2.998 -0.309 -3.989 -1.205c-0.991 -0.896 -1.486 -2.235 -1.486 -4.019l-0 -3.264c-0 -1.783 0.495 -3.177 1.486 -4.183c0.991 -1.005 2.321 -1.554 3.989 -1.646c1.669 -0.093 2.956 0.295 3.863 1.163c0.906 0.868 1.359 2.101 1.359 3.701l-0 0.118l-2.308 0.127l0 -0.177c0 -0.865 -0.238 -1.563 -0.714 -2.094c-0.476 -0.531 -1.209 -0.769 -2.2 -0.714c-0.964 0.053 -1.724 0.393 -2.278 1.021c-0.554 0.627 -0.831 1.465 -0.831 2.514l-0 3.343c-0 1.036 0.277 1.84 0.831 2.412c0.554 0.573 1.314 0.832 2.278 0.779c0.991 -0.055 1.724 -0.374 2.2 -0.957c0.476 -0.584 0.714 -1.308 0.714 -2.174l0 -0.334l2.308 -0.128l-0 0.276c-0 1.599 -0.453 2.883 -1.359 3.851c-0.907 0.968 -2.194 1.498 -3.863 1.59Zm7.431 -0.686l0 -13.767l2.367 -0.131l-0 5.605l0.332 -0.018l4.772 -5.869l3.031 -0.168l-5.965 7.115l6.16 6.641l-3.109 0.172l-4.889 -5.452l-0.332 0.018l-0 5.723l-2.367 0.131Zm12.164 -0.673l0 -13.766l2.366 -0.131l0 11.623l6.415 -0.355l-0 2.144l-8.781 0.485Zm10.619 -0.587l-0 -13.767l8.722 -0.482l-0 2.144l-6.356 0.351l0 3.619l5.808 -0.321l0 2.143l-5.808 0.322l0 3.717l6.454 -0.357l-0 2.143l-8.82 0.488Zm-55.656 -4.219l2.934 -0.162c0.678 -0.037 1.222 -0.251 1.632 -0.641c0.411 -0.39 0.616 -0.906 0.616 -1.548l0 -0.197c0 -0.642 -0.202 -1.136 -0.606 -1.481c-0.404 -0.345 -0.951 -0.498 -1.642 -0.46l-2.934 0.163l0 4.326Z" FillRule="EvenOdd" />
+                </Path.Data>
+              </Path>
+              <Path Name="path282" Fill="#40FFFFFF">
+                <Path.Data>
+                  <PathGeometry Figures="M17.54 10.326l-11.594 0.636l2.404 2.147l11.594 -0.637l-2.404 -2.146Z" FillRule="EvenOdd" />
+                </Path.Data>
+              </Path>
+              <Path Name="path284" Fill="#80FFFFFF">
+                <Path.Data>
+                  <PathGeometry Figures="M8.35 13.109l-2.404 -2.147l-0 11.563l2.404 2.146l0 -11.562Z" FillRule="EvenOdd" />
+                </Path.Data>
+              </Path>
+            </Canvas>
+            <TextBlock
+              Grid.Column="1"
+              Margin="5,0,0,0"
+              VerticalAlignment="Center"
+              Classes="SpeckleFont"
+              FontSize="16"
+              FontWeight="Medium"
+              Foreground="White"
+              Text="Mapping Tool (alpha)"
+              TextTrimming="CharacterEllipsis" />
+
+            <TextBlock
+              Grid.Column="2"
+              Margin="2,0,0,7"
+              VerticalAlignment="Bottom"
+              FontSize="8"
+              Foreground="White"
+              Text="{Binding Version}"
+              TextTrimming="CharacterEllipsis" />
+
+
+          </Grid>
+        </Border>
+
+        <TabControl Grid.Row="1">
+          <TabItem Header="To Revit" ToolTip.Tip="Map to Revit BIM elements">
+            <ScrollViewer>
+
+              <StackPanel
+                Margin="10"
+                Orientation="Vertical"
+                Spacing="10">
+                <m:Card Padding="0">
+                  <!--  NEW MAPPINGS  -->
+                  <StackPanel Orientation="Vertical">
+                    <ProgressBar IsIndeterminate="True" IsVisible="{Binding ShowProgress, FallbackValue=True}" />
+                    <StackPanel
+                      Margin="15"
+                      Orientation="Vertical"
+                      Spacing="5">
+
+                      <StackPanel Margin="0,0,0,5" Orientation="Horizontal">
+                        <icons:MaterialIcon
+                          VerticalAlignment="Center"
+                          Foreground="Gray"
+                          Kind="InfoCircle"
+                          ToolTip.Tip="Select a stream coming from Revit with types and levels&#x0a;then select some objects.&#x0a;&#x0a;CURRENT MAPPINGS:&#x0a;DirectShape from Brep and Mesh&#x0a;Wall from Extrusion&#x0a;Beam/Brace from Line&#x0a;Family Instance from Point or Block" />
+                        <TextBlock
+                          Margin="5,0"
+                          VerticalAlignment="Center"
+                          Classes="Overline"
+                          Foreground="Gray"
+                          Text="NEW MAPPINGS" />
+                      </StackPanel>
+
+                      <!--  SET STREAM AND ELEMENT TYPE  -->
+                      <StackPanel
+                        IsVisible="{Binding RevitViewModels.Count}"
+                        Orientation="Vertical"
+                        Spacing="5">
+                        <Button
+                          Margin="0,0,0,5"
+                          Command="{Binding OpenStreamSelectorCommand}"
+                          IsEnabled="{Binding !ShowProgress}">
+                          <Grid>
+                            <TextBlock
+                              Classes="SpeckleFont"
+                              IsVisible="{Binding SelectedStream, Converter={x:Static ObjectConverters.IsNull}}"
+                              Text="Select Mapping Source" />
+                            <StackPanel IsVisible="{Binding SelectedStream, Converter={x:Static ObjectConverters.IsNotNull}}" Orientation="Horizontal">
+                              <TextBlock Classes="SpeckleFont" Text="Stream: " />
+                              <TextBlock Classes="SpeckleFont" Text="{Binding SelectedStream.Stream.name}" />
+                            </StackPanel>
+                          </Grid>
+                        </Button>
+                        <ComboBox
+                          Grid.Row="2"
+                          assists:ComboBoxAssist.Label="Revit Element to Map"
+                          Classes="Outline"
+                          IsVisible="{Binding Schemas.Count}"
+                          Items="{Binding Schemas}"
+                          SelectedIndex="0"
+                          SelectedItem="{Binding SelectedSchema, Mode=TwoWay}">
+                          <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                              <TextBlock
+                                Grid.Column="1"
+                                Text="{Binding Name}"
+                                TextTrimming="CharacterEllipsis" />
+                            </DataTemplate>
+                          </ComboBox.ItemTemplate>
+                        </ComboBox>
+                        <TextBlock
+                          Margin="5,10"
+                          Classes="Overline"
+                          Foreground="Gray"
+                          IsVisible="{Binding PromptMsg, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                          Text="{Binding PromptMsg}"
+                          TextWrapping="Wrap" />
+
+                      </StackPanel>
+
+                      <!--  DYNAMIC PROPERTIES  -->
+                      <ContentControl Content="{Binding SelectedSchema}" IsVisible="{Binding SelectedSchema, Converter={x:Static ObjectConverters.IsNotNull}}">
+                        <ContentControl.DataTemplates>
+                          <!--  DATA TEMPLATES FOR OUR SCHEMAS  -->
+                          <!--  WALL  -->
+                          <DataTemplate DataType="{x:Type s:RevitWallViewModel}">
+                            <map:RevitBasic />
+                          </DataTemplate>
+                          <!--  BEAM  -->
+                          <DataTemplate DataType="{x:Type s:RevitBeamViewModel}">
+                            <map:RevitBasic />
+                          </DataTemplate>
+                          <!--  BRACE  -->
+                          <DataTemplate DataType="{x:Type s:RevitBraceViewModel}">
+                            <map:RevitBasic />
+                          </DataTemplate>
+                          <!--  FAMILY INSTANCE  -->
+                          <DataTemplate DataType="{x:Type s:RevitFamilyInstanceViewModel}">
+                            <map:RevitBasic />
+                          </DataTemplate>
+                          <!--  DIRECTSHAPE  -->
+                          <DataTemplate DataType="{x:Type s:DirectShapeFreeformViewModel}">
+                            <StackPanel Orientation="Vertical" Spacing="5">
+                              <TextBox
+                                assists:TextFieldAssist.Label="Name"
+                                Text="{Binding ShapeName, Mode=TwoWay}"
+                                UseFloatingWatermark="True" />
+                              <TextBlock
+                                Classes="Overline"
+                                Foreground="Gray"
+                                Text="If sending multiple elements, unique names will be generated for each."
+                                TextWrapping="Wrap" />
+                              <ComboBox
+                                assists:ComboBoxAssist.Label="Category"
+                                Classes="Outline"
+                                Items="{Binding Categories}"
+                                SelectedItem="{Binding SelectedCategory, Mode=TwoWay}" />
+                              <!--<CheckBox
+                              Margin="0,10"
+                              Content="Create as FreeForm element?"
+                              IsChecked="{Binding Freeform}" />-->
+                            </StackPanel>
+                          </DataTemplate>
+                        </ContentControl.DataTemplates>
+
+
+                      </ContentControl>
+
+                      <!--  APPLY MAPPINGS  -->
+                      <StackPanel Orientation="Vertical" Spacing="5">
+
+                        <StackPanel Margin="5" Orientation="Horizontal">
+                          <TextBlock Classes="Caption" Text="Selected elements: " />
+                          <TextBlock Classes="Caption" Text="{Binding Count}" />
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                          <Button
+                            Margin="0,0,10,0"
+                            Classes="Flat"
+                            Command="{Binding ClearMappingsCommand}"
+                            Content="Clear Mappings"
+                            IsEnabled="{Binding Count}"
+                            ToolTip.Tip="Remove mappings from all the selected elements" />
+                          <Button
+                            Command="{Binding SetMappingsCommand}"
+                            Content="Apply Mappings"
+                            IsEnabled="{Binding SelectedSchema, Converter={x:Static ObjectConverters.IsNotNull}}"
+                            ToolTip.Tip="Apply mappings to all the selected elements" />
+                        </StackPanel>
+
+                      </StackPanel>
+
+                    </StackPanel>
+                  </StackPanel>
+                </m:Card>
+
+                <!--  EXISTING MAPPINGS  -->
+                <m:Card Padding="15" IsVisible="{Binding ExistingSchemas.Count}">
+                  <StackPanel Orientation="Vertical">
+                    <StackPanel Orientation="Horizontal">
+                      <icons:MaterialIcon
+                        VerticalAlignment="Center"
+                        Foreground="Gray"
+                        Kind="InfoCircle"
+                        ToolTip.Tip="A commit is a snapshot in time&#x0a;of the data inside a branch.&#x0a;Every time you send to Speckle from a connector,&#x0a;a commit is created." />
+                      <TextBlock
+                        Margin="5,0"
+                        VerticalAlignment="Center"
+                        Classes="Overline"
+                        Foreground="Gray"
+                        Text="EXISTING MAPPINGS" />
+                    </StackPanel>
+
+                    <ItemsControl Items="{Binding ExistingSchemas}">
+                      <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                          <Expander
+                            Classes="Minimal Transparent"
+                            PointerEnter="PointerEnterEvent"
+                            PointerLeave="PointerLeaveEvent">
+                            <Expander.Header>
+                              <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{Binding Name}" />
+                                <TextBlock Text=" (" />
+                                <TextBlock Text="{Binding Schemas.Count}" />
+                                <TextBlock Text=")" />
+                              </StackPanel>
+                            </Expander.Header>
+                            <ListBox
+                              Items="{Binding Schemas}"
+                              SelectionChanged="SelectionChanged"
+                              SelectionMode="Multiple">
+                              <ListBox.Styles>
+                                <Style Selector="ListBox ListBoxItem">
+                                  <Setter Property="Padding" Value="0" />
+                                </Style>
+                                <Style Selector="ListBoxItem /template/ Border#selectedBorder">
+                                  <Setter Property="IsVisible" Value="False" />
+                                </Style>
+                              </ListBox.Styles>
+                              <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                  <Grid>
+                                    <TextBlock
+                                      Padding="5,5"
+                                      HorizontalAlignment="Stretch"
+                                      Text="{Binding Summary}" />
+                                    <!--  hack to get the PointerEnter event to trigger  -->
+                                    <Border
+                                      Background="{DynamicResource MaterialDesignCardBackground}"
+                                      Opacity="0.01"
+                                      PointerEnter="PointerEnterEventItem"
+                                      PointerLeave="PointerLeaveEvent" />
+
+                                  </Grid>
+
+                                </DataTemplate>
+                              </ListBox.ItemTemplate>
+                            </ListBox>
+
+                          </Expander>
+                        </DataTemplate>
+                      </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+
+
+                  </StackPanel>
+                </m:Card>
+
+
+              </StackPanel>
+            </ScrollViewer>
+
+          </TabItem>
+
+          <TabItem Header="To Archicad" ToolTip.Tip="Coming soon! Map to Archicad BIM elements">
+            <TextBlock
+              Margin="40"
+              HorizontalAlignment="Center"
+              Text="Coming soon!" />
+          </TabItem>
+          <TabItem Header="To Tekla" ToolTip.Tip="Coming soon! Map to Tekla BIM elements">
+            <TextBlock
+              Margin="40"
+              HorizontalAlignment="Center"
+              Text="Coming soon!" />
+          </TabItem>
+        </TabControl>
+
+
+      </Grid>
+
+      <!--  STREAM SELECTOR  -->
+      <c:StreamSelector DataContext="{Binding StreamSelector}" IsVisible="{Binding IsVisible, FallbackValue=False}" />
+    </Grid>
+  </ContentControl>
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml.cs b/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml.cs
new file mode 100644
index 0000000000..bf7a1321d1
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml.cs
@@ -0,0 +1,46 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+using DesktopUI2.ViewModels;
+using DesktopUI2.ViewModels.MappingTool;
+using ReactiveUI;
+using Speckle.Core.Logging;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DesktopUI2.Views
+{
+  public partial class MappingsControl : ReactiveUserControl<MappingsViewModel>
+  {
+    public MappingsControl()
+    {
+      this.WhenActivated(disposables => { });
+      AvaloniaXamlLoader.Load(this);
+
+      Analytics.TrackEvent(Analytics.Events.MappingsAction, new Dictionary<string, object>() { { "name", "Mappings Launched" } });
+    }
+    //these methods are here as it wasn't easy to have them in the MappingsViewModel
+    private void SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+      var items = (sender as ListBox).SelectedItems.Cast<Schema>().ToList();
+      MappingsViewModel.Instance.Bindings.SelectElements(items.Select(x => x.ApplicationId).ToList());
+    }
+
+    private void PointerEnterEvent(object sender, Avalonia.Input.PointerEventArgs e)
+    {
+      var dc = (sender as Control).DataContext as SchemaGroup;
+      MappingsViewModel.Instance.Bindings.HighlightElements(dc.Schemas.Select(x => x.ApplicationId).ToList());
+    }
+
+    private void PointerEnterEventItem(object sender, Avalonia.Input.PointerEventArgs e)
+    {
+      var dc = (sender as Control).DataContext as Schema;
+      MappingsViewModel.Instance.Bindings.HighlightElements(new List<string> { dc.ApplicationId });
+    }
+
+    private void PointerLeaveEvent(object sender, Avalonia.Input.PointerEventArgs e)
+    {
+      MappingsViewModel.Instance.Bindings.HighlightElements(new List<string>());
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/MappingsWindow.xaml b/DesktopUI2/DesktopUI2/Views/MappingsWindow.xaml
new file mode 100644
index 0000000000..677fbd5707
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/MappingsWindow.xaml
@@ -0,0 +1,16 @@
+<Window
+  x:Class="DesktopUI2.Views.MappingsWindow"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:p="clr-namespace:DesktopUI2.Views"
+  Title="{Binding TitleFull}"
+  Width="400"
+  Height="750"
+  Icon="/Assets/icon.ico"
+  mc:Ignorable="d">
+
+  <p:MappingsControl />
+
+</Window>
diff --git a/DesktopUI2/DesktopUI2/Views/MappingsWindow.xaml.cs b/DesktopUI2/DesktopUI2/Views/MappingsWindow.xaml.cs
new file mode 100644
index 0000000000..cf6411cad5
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/MappingsWindow.xaml.cs
@@ -0,0 +1,33 @@
+using Avalonia;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+using DesktopUI2.ViewModels;
+using DesktopUI2.ViewModels.MappingTool;
+using ReactiveUI;
+using System.ComponentModel;
+
+namespace DesktopUI2.Views
+{
+  public partial class MappingsWindow : ReactiveWindow<MappingsViewModel>
+  {
+    public MappingsWindow()
+    {
+
+      this.WhenActivated(disposables => { });
+      AvaloniaXamlLoader.Load(this);
+
+#if DEBUG
+      this.AttachDevTools(KeyGesture.Parse("CTRL+R"));
+#endif
+
+    }
+
+    protected override void OnClosing(CancelEventArgs e)
+    {
+      this.Hide();
+      e.Cancel = true;
+      base.OnClosing(e);
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/CollaboratorsView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/CollaboratorsView.xaml
new file mode 100644
index 0000000000..227865b631
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Pages/CollaboratorsView.xaml
@@ -0,0 +1,61 @@
+<UserControl
+  x:Class="DesktopUI2.Views.Pages.CollaboratorsView"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
+  xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:p="clr-namespace:DesktopUI2.Views.Pages"
+  xmlns:reactiveUi="http://reactiveui.net"
+  xmlns:vm="using:DesktopUI2.ViewModels.DesignViewModels"
+  d:DesignHeight="750"
+  d:DesignWidth="400"
+  mc:Ignorable="d">
+  <Grid RowDefinitions="auto,*">
+    <Border
+      Margin="0,0,0,7"
+      Padding="0"
+      assists:ShadowAssist.ShadowDepth="Depth2"
+      Background="{DynamicResource PrimaryHueMidBrush}">
+      <Grid Margin="15" ColumnDefinitions="auto,*,auto, auto">
+        <m:FloatingButton
+          VerticalAlignment="Center"
+          assists:ShadowAssist.ShadowDepth="0"
+          Background="Transparent"
+          Classes=""
+          Command="{Binding GoBack}"
+          ToolTip.Tip="Back">
+          <Button.Content>
+            <Viewbox
+              HorizontalAlignment="Stretch"
+              VerticalAlignment="Stretch"
+              Stretch="Fill">
+              <icons:MaterialIcon
+                Width="24"
+                Height="24"
+                Foreground="White"
+                Kind="ChevronLeft" />
+            </Viewbox>
+          </Button.Content>
+        </m:FloatingButton>
+        <TextBlock
+          Grid.Column="1"
+          Margin="15,0,0,0"
+          VerticalAlignment="Center"
+          Classes="Medium SpeckleFont"
+          FontSize="20"
+          Foreground="White"
+          Text="Collaborators"
+          TextTrimming="CharacterEllipsis" />
+
+      </Grid>
+    </Border>
+
+    <c:CollaboratorsControl Grid.Row="1" Margin="15" />
+  </Grid>
+
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/CollaboratorsView.xaml.cs b/DesktopUI2/DesktopUI2/Views/Pages/CollaboratorsView.xaml.cs
similarity index 68%
rename from DesktopUI2/DesktopUI2/Views/Pages/ShareControls/CollaboratorsView.xaml.cs
rename to DesktopUI2/DesktopUI2/Views/Pages/CollaboratorsView.xaml.cs
index c7c9440623..4cb287914b 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/CollaboratorsView.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/Pages/CollaboratorsView.xaml.cs
@@ -1,17 +1,16 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
-using DesktopUI2.ViewModels.Share;
+using DesktopUI2.ViewModels;
 using ReactiveUI;
 
-namespace DesktopUI2.Views.Pages.ShareControls
+namespace DesktopUI2.Views.Pages
 {
   public partial class CollaboratorsView : ReactiveUserControl<CollaboratorsViewModel>
   {
-    public static CollaboratorsView Instance { get; private set; }
+
     public CollaboratorsView()
     {
       InitializeComponent();
-      Instance = this;
     }
 
     private void InitializeComponent()
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/HomeView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/HomeView.xaml
index 79b86b043b..0c5ce85851 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/HomeView.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Pages/HomeView.xaml
@@ -3,6 +3,7 @@
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
   xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:dvm="clr-namespace:DesktopUI2.ViewModels.DesignViewModels"
@@ -11,8 +12,6 @@
   xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   xmlns:ripple="clr-namespace:Material.Ripple;assembly=Material.Ripple"
-  xmlns:sc="clr-namespace:DesktopUI2.Views.Pages.SharedControls"
-  xmlns:uc="clr-namespace:DesktopUI2.Views.Pages.HomeControls"
   xmlns:vm="clr-namespace:DesktopUI2.ViewModels"
   d:DesignHeight="550"
   d:DesignWidth="400"
@@ -23,237 +22,122 @@
   <UserControl.Resources>
     <conv:EnumBooleanConverter x:Key="EnumBooleanConverter" />
   </UserControl.Resources>
-  <UserControl.Styles>
-    <Style Selector="MenuItem.Profile">
-      <Setter Property="Header">
-        <Setter.Value>
-          <Template>
-            <Grid RowDefinitions="auto,auto">
-              <TextBlock Text="{Binding FullAccountName}" />
-              <TextBlock
-                Grid.Row="1"
-                Classes="Overline"
-                Text="{Binding FullServerName}" />
-            </Grid>
-          </Template>
-        </Setter.Value>
-
-      </Setter>
-      <Setter Property="Icon">
-        <Setter.Value>
-          <Template>
-            <Image
-              Width="20"
-              Height="20"
-              Source="{Binding AvatarImage}">
-
-              <Image.Clip>
-                <EllipseGeometry Rect="0,0,20,20" />
-              </Image.Clip>
-            </Image>
-          </Template>
-        </Setter.Value>
-      </Setter>
-
-    </Style>
-
-  </UserControl.Styles>
   <Grid RowDefinitions="auto, *">
-    <m:Card
-      Padding="15,10"
+    <!--  HEADER BAR  -->
+    <Border
+      Padding="10"
       Background="{DynamicResource PrimaryHueMidBrush}"
       CornerRadius="0">
-      <Grid ColumnDefinitions="auto,*">
-        <StackPanel
-          VerticalAlignment="Bottom"
-          Orientation="Horizontal"
-          Spacing="6">
-          <Image Height="30" Source="../../Assets/logo.png" />
-          <TextBlock
-            Classes="SpeckleFont"
-            FontSize="18"
-            FontWeight="Medium"
-            Foreground="White"
-            Text="{Binding Title}" />
-
-          <TextBlock
-            Margin="0,0,0,8"
-            VerticalAlignment="Bottom"
-            FontSize="8"
-            Foreground="White"
-            Text="{Binding Version}" />
-        </StackPanel>
-
-        <StackPanel
+      <Grid ColumnDefinitions="auto,auto,*,auto,auto,auto,auto">
+
+        <Canvas
+          Grid.Column="0"
+          Width="109"
+          Height="30">
+          <Path Name="path280" Fill="#FFFFFFFF">
+            <Path.Data>
+              <PathGeometry Figures="M108.934 -0l-108.868 6.02l0 23.98l108.868 -6.02l-0 -23.98Zm-89.08 12.484l0.09 -0.005l-2.404 -2.146l-11.594 0.636l-0 11.563l2.314 2.066l-0 0.08l0.085 -0.004l0.005 0.004l0 -0.005l11.504 -0.631l-0 -11.558Zm8.023 11.148c-1.043 0.057 -1.965 -0.079 -2.767 -0.408c-0.802 -0.329 -1.431 -0.835 -1.887 -1.518c-0.457 -0.683 -0.685 -1.536 -0.685 -2.558l0 -0.512l2.327 -0.128l0 0.511c0 0.905 0.274 1.565 0.822 1.98c0.547 0.416 1.277 0.598 2.19 0.548c0.926 -0.051 1.623 -0.28 2.092 -0.686c0.47 -0.406 0.704 -0.911 0.704 -1.514c0 -0.406 -0.11 -0.731 -0.332 -0.975c-0.222 -0.243 -0.544 -0.432 -0.968 -0.566c-0.424 -0.134 -0.935 -0.256 -1.535 -0.367l-0.587 -0.086c-0.899 -0.16 -1.678 -0.382 -2.337 -0.667c-0.658 -0.285 -1.163 -0.673 -1.515 -1.165c-0.352 -0.492 -0.528 -1.151 -0.528 -1.977c-0 -0.826 0.195 -1.545 0.586 -2.156c0.392 -0.612 0.946 -1.095 1.663 -1.449c0.717 -0.355 1.558 -0.558 2.522 -0.612c0.965 -0.053 1.826 0.063 2.582 0.349c0.756 0.286 1.352 0.745 1.789 1.376c0.437 0.632 0.655 1.439 0.655 2.422l0 0.649l-2.327 0.129l0 -0.649c0 -0.564 -0.111 -1.01 -0.332 -1.339c-0.222 -0.328 -0.535 -0.56 -0.939 -0.695c-0.404 -0.135 -0.88 -0.187 -1.428 -0.157c-0.808 0.045 -1.421 0.236 -1.838 0.574c-0.417 0.337 -0.626 0.795 -0.626 1.371c0 0.368 0.095 0.674 0.284 0.919c0.189 0.245 0.469 0.439 0.841 0.583c0.371 0.143 0.837 0.258 1.398 0.345l0.587 0.106c0.938 0.157 1.76 0.378 2.464 0.66c0.704 0.282 1.255 0.674 1.652 1.177c0.398 0.502 0.597 1.173 0.597 2.012c-0 0.826 -0.212 1.566 -0.636 2.218c-0.424 0.653 -1.017 1.178 -1.78 1.574c-0.762 0.396 -1.665 0.623 -2.708 0.681Zm7.177 -0.673l-0 -13.766l5.534 -0.306c0.861 -0.048 1.617 0.081 2.269 0.386c0.652 0.304 1.167 0.758 1.545 1.36c0.378 0.602 0.567 1.329 0.567 2.181l-0 0.275c-0 0.839 -0.193 1.584 -0.577 2.235c-0.385 0.65 -0.906 1.164 -1.565 1.542c-0.658 0.377 -1.404 0.589 -2.239 0.635l-3.168 0.175l0 5.153l-2.366 0.13Zm11.792 -0.652l0 -13.766l8.722 -0.483l-0 2.144l-6.356 0.352l0 3.618l5.808 -0.321l0 2.144l-5.808 0.321l0 3.717l6.454 -0.357l-0 2.144l-8.82 0.487Zm16.016 -0.61c-1.668 0.092 -2.998 -0.309 -3.989 -1.205c-0.991 -0.896 -1.486 -2.235 -1.486 -4.019l-0 -3.264c-0 -1.783 0.495 -3.177 1.486 -4.183c0.991 -1.005 2.321 -1.554 3.989 -1.646c1.669 -0.093 2.956 0.295 3.863 1.163c0.906 0.868 1.359 2.101 1.359 3.701l-0 0.118l-2.308 0.127l0 -0.177c0 -0.865 -0.238 -1.563 -0.714 -2.094c-0.476 -0.531 -1.209 -0.769 -2.2 -0.714c-0.964 0.053 -1.724 0.393 -2.278 1.021c-0.554 0.627 -0.831 1.465 -0.831 2.514l-0 3.343c-0 1.036 0.277 1.84 0.831 2.412c0.554 0.573 1.314 0.832 2.278 0.779c0.991 -0.055 1.724 -0.374 2.2 -0.957c0.476 -0.584 0.714 -1.308 0.714 -2.174l0 -0.334l2.308 -0.128l-0 0.276c-0 1.599 -0.453 2.883 -1.359 3.851c-0.907 0.968 -2.194 1.498 -3.863 1.59Zm7.431 -0.686l0 -13.767l2.367 -0.131l-0 5.605l0.332 -0.018l4.772 -5.869l3.031 -0.168l-5.965 7.115l6.16 6.641l-3.109 0.172l-4.889 -5.452l-0.332 0.018l-0 5.723l-2.367 0.131Zm12.164 -0.673l0 -13.766l2.366 -0.131l0 11.623l6.415 -0.355l-0 2.144l-8.781 0.485Zm10.619 -0.587l-0 -13.767l8.722 -0.482l-0 2.144l-6.356 0.351l0 3.619l5.808 -0.321l0 2.143l-5.808 0.322l0 3.717l6.454 -0.357l-0 2.143l-8.82 0.488Zm-55.656 -4.219l2.934 -0.162c0.678 -0.037 1.222 -0.251 1.632 -0.641c0.411 -0.39 0.616 -0.906 0.616 -1.548l0 -0.197c0 -0.642 -0.202 -1.136 -0.606 -1.481c-0.404 -0.345 -0.951 -0.498 -1.642 -0.46l-2.934 0.163l0 4.326Z" FillRule="EvenOdd" />
+            </Path.Data>
+          </Path>
+          <Path Name="path282" Fill="#40FFFFFF">
+            <Path.Data>
+              <PathGeometry Figures="M17.54 10.326l-11.594 0.636l2.404 2.147l11.594 -0.637l-2.404 -2.146Z" FillRule="EvenOdd" />
+            </Path.Data>
+          </Path>
+          <Path Name="path284" Fill="#80FFFFFF">
+            <Path.Data>
+              <PathGeometry Figures="M8.35 13.109l-2.404 -2.147l-0 11.563l2.404 2.146l0 -11.562Z" FillRule="EvenOdd" />
+            </Path.Data>
+          </Path>
+        </Canvas>
+        <TextBlock
           Grid.Column="1"
-          HorizontalAlignment="Right"
+          Margin="5,0,0,0"
+          VerticalAlignment="Center"
+          Classes="SpeckleFont"
+          FontSize="16"
+          FontWeight="Medium"
+          Foreground="White"
+          Text="{Binding Title}"
+          TextTrimming="CharacterEllipsis" />
+
+        <TextBlock
+          Grid.Column="2"
+          Margin="2,0,0,7"
           VerticalAlignment="Bottom"
-          Orientation="Horizontal"
-          Spacing="6">
-
-          <!--<m:FloatingButton
-            Grid.Column="1"
-            VerticalAlignment="Center"
-            assists:ShadowAssist.ShadowDepth="Depth0"
-            Background="Transparent"
-            Classes="Mini"
-            Command="{Binding TestCommand}"
-            ToolTip.Tip="Test stuff">
-            <Button.Content>
-              <icons:MaterialIcon
-                Width="15"
-                Height="15"
-                assists:ShadowAssist.ShadowDepth="0"
-                Foreground="{DynamicResource MaterialDesignBody}"
-                Kind="Bomb" />
-
-            </Button.Content>
-          </m:FloatingButton>-->
-          <m:FloatingButton
-            Grid.Column="1"
-            VerticalAlignment="Center"
-            assists:ShadowAssist.ShadowDepth="Depth0"
-            Background="Transparent"
-            Classes="Mini"
-            Command="{Binding ToggleDarkThemeCommand}"
-            ToolTip.Tip="Toggle dark theme">
-            <Button.Content>
-              <icons:MaterialIcon
-                Width="15"
-                Height="15"
-                assists:ShadowAssist.ShadowDepth="0"
-                Foreground="White"
-                Kind="SunMoonStars" />
-
-            </Button.Content>
-          </m:FloatingButton>
+          FontSize="8"
+          Foreground="White"
+          Text="{Binding Version}"
+          TextTrimming="CharacterEllipsis" />
+
+
+        <!--  ACCOUNT MENU  -->
+
+        <Menu
+          Grid.Column="5"
+          VerticalAlignment="Center"
+          Items="{Binding MenuItems}">
+          <Menu.Styles>
+            <Style Selector="MenuItem">
+              <Setter Property="Header" Value="{Binding Header}" />
+              <Setter Property="Icon" Value="{Binding Icon}" />
+              <Setter Property="MinWidth" Value="28" />
+              <Setter Property="Items" Value="{Binding Items}" />
+              <Setter Property="Command" Value="{Binding Command}" />
+              <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
+            </Style>
+          </Menu.Styles>
+        </Menu>
+
+
+
+        <!--  NOTIFICATIONS  -->
+        <Grid Grid.Column="6" IsVisible="{Binding Notifications.Count}">
           <m:FloatingButton
-            Grid.Column="1"
             VerticalAlignment="Center"
             assists:ShadowAssist.ShadowDepth="Depth0"
             Background="Transparent"
             Classes="Mini"
-            Command="{Binding RefreshCommand}"
-            ToolTip.Tip="Refresh">
+            Command="{Binding NotificationsCommand}"
+            ToolTip.Tip="Notifications">
             <Button.Content>
-              <icons:MaterialIcon
-                Width="15"
-                Height="15"
-                assists:ShadowAssist.ShadowDepth="0"
-                Foreground="White"
-                Kind="Refresh" />
+              <Grid>
+                <icons:MaterialIcon
+                  Width="15"
+                  Height="15"
+                  assists:ShadowAssist.ShadowDepth="0"
+                  Foreground="White"
+                  Kind="Notifications" />
+              </Grid>
             </Button.Content>
           </m:FloatingButton>
-
-          <!--  ACCOUNT MENU  -->
-          <Menu
-            VerticalAlignment="Center"
-            IsVisible="{Binding HasOneAccount}"
-            ToolTip.Tip="Account">
-            <MenuItem Padding="0">
-              <MenuItem.Header>
-                <Image
-                  Width="28"
-                  Height="28"
-                  Source="{Binding Accounts[0].AvatarImage}">
-
-                  <Image.Clip>
-                    <EllipseGeometry Rect="0,0,28,28" />
-                  </Image.Clip>
-                </Image>
-              </MenuItem.Header>
-              <MenuItem
-                Classes="Profile"
-                Command="{Binding $parent[local:HomeView].DataContext.OpenProfileCommand}"
-                CommandParameter="{Binding Account}"
-                DataContext="{Binding Accounts[0]}" />
-              <Separator />
-              <MenuItem
-                Command="{Binding AddAccountCommand}"
-                Header="Add another account"
-                Icon="{icons:MaterialIconExt AccountPlus}" />
-              <MenuItem
-                Command="{Binding LaunchManagerCommand}"
-                Header="Manage accounts in Manager"
-                Icon="{icons:MaterialIconExt AccountCog}" />
-              <MenuItem
-                Command="{Binding RemoveAccountCommand}"
-                CommandParameter="{Binding Accounts[0].Account}"
-                Header="Log Out"
-                Icon="{icons:MaterialIconExt Logout}" />
-            </MenuItem>
-          </Menu>
-
-          <!--  MULTIPLE ACCOUNTS MENU  -->
-          <Menu
-            VerticalAlignment="Center"
-            IsVisible="{Binding HasMultipleAccounts}"
-            ToolTip.Tip="Accounts">
-            <MenuItem
-              Width="30"
-              Height="30"
+          <Border
+            Width="15"
+            Height="15"
+            Margin="15,0,0,15"
+            Background="Red"
+            CornerRadius="8"
+            ToolTip.Tip="You have notifications">
+            <TextBlock
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              assists:TextFieldAssist.CornerRadius="20"
+              FontSize="8"
+              FontWeight="Bold"
               Foreground="White"
-              Header="{icons:MaterialIconExt AccountMultiple}">
-
-              <MenuItem
-                Header="Accounts"
-                Icon="{icons:MaterialIconExt AccountMultiple}"
-                Items="{Binding Accounts}">
-                <MenuItem.DataTemplates>
-                  <DataTemplate>
-                    <MenuItem Classes="Profile">
-                      <MenuItem
-                        Command="{Binding $parent[local:HomeView].DataContext.OpenProfileCommand}"
-                        CommandParameter="{Binding Account}"
-                        Header="View online"
-                        Icon="{icons:MaterialIconExt ExternalLink}" />
-                      <MenuItem
-                        Command="{Binding $parent[local:HomeView].DataContext.RemoveAccountCommand}"
-                        CommandParameter="{Binding Account}"
-                        Header="Remove account"
-                        Icon="{icons:MaterialIconExt AccountMinus}" />
-                    </MenuItem>
-                  </DataTemplate>
+              Text="{Binding Notifications.Count}" />
+          </Border>
+        </Grid>
 
-                </MenuItem.DataTemplates>
-              </MenuItem>
-              <MenuItem
-                Command="{Binding $parent[local:HomeView].DataContext.AddAccountCommand}"
-                Header="Add another account"
-                Icon="{icons:MaterialIconExt AccountPlus}" />
-              <MenuItem
-                Command="{Binding $parent[local:HomeView].DataContext.LaunchManagerCommand}"
-                Header="Manage accounts in Manager"
-                Icon="{icons:MaterialIconExt AccountCog}" />
-
-            </MenuItem>
-          </Menu>
-
-          <!--  UPDATE NOTIFICATION  -->
-          <Menu
-            VerticalAlignment="Center"
-            IsVisible="{Binding HasUpdate}"
-            ToolTip.Tip="Update available">
-            <MenuItem
-              Width="30"
-              Height="30"
-              Foreground="Red"
-              Header="{icons:MaterialIconExt Notifications}">
-              <MenuItem
-                Command="{Binding LaunchManagerCommand}"
-                Header="An update for this connector is available, install it now!"
-                Icon="{icons:MaterialIconExt ExternalLink}" />
-            </MenuItem>
-          </Menu>
 
-        </StackPanel>
       </Grid>
-    </m:Card>
+    </Border>
+    <!--  MAIN BODY  -->
     <Grid
       Grid.Row="1"
       Margin="5,10,5,5"
       IsVisible="{Binding HasAccounts}"
-      RowDefinitions="auto,auto, auto,auto, *">
+      RowDefinitions="auto,auto, auto, *, auto">
 
       <!--  SEARCH STREAMS  -->
       <Grid Grid.Row="0" Margin="0">
@@ -405,7 +289,7 @@
 
 
       <ScrollViewer
-        Grid.Row="4"
+        Grid.Row="3"
         Padding="0,5,13,5"
         IsEnabled="{Binding InProgress, Converter={x:Static BoolConverters.Not}, FallbackValue=True}">
         <StackPanel Margin="5,0,5,5" Orientation="Vertical">
@@ -422,7 +306,7 @@
                 IsVisible="{Binding HasSavedStreams}"
                 Text="SAVED STREAMS:" />
             </Expander.Header>
-            <uc:SavedStreams />
+            <c:SavedStreams />
           </Expander>
 
 
@@ -498,7 +382,7 @@
                             Text="{Binding Stream.description}"
                             TextTrimming="CharacterEllipsis" />
 
-                          <sc:StreamDetails Grid.Row="1" />
+                          <c:StreamDetails Grid.Row="1" />
 
                           <Grid
                             Grid.Row="2"
@@ -569,48 +453,51 @@
 
       </ScrollViewer>
 
+      <Button
+        Grid.Row="4"
+        Margin="5"
+        Classes="Flat Mini"
+        Command="{Binding OneClickModeCommand}">
+        <Button.Content>
+          <StackPanel
+            Margin="10"
+            Orientation="Horizontal"
+            Spacing="12">
+            <icons:MaterialIcon
+              Width="15"
+              Height="15"
+              Foreground="{DynamicResource PrimaryHueDarkBrush}"
+              Kind="SwapHorizontalVariant" />
+            <TextBlock Classes="ButtonText" Text="Switch to OneClick mode" />
+          </StackPanel>
+        </Button.Content>
+      </Button>
 
     </Grid>
-    <Grid
+    <!--  NO INTERNET  -->
+    <Border
       Grid.Row="1"
-      Margin="15"
-      IsVisible="{Binding HasAccounts, Converter={x:Static BoolConverters.Not}, FallbackValue=True}">
-      <m:Card
-        Margin="10"
-        Padding="30"
-        VerticalAlignment="Top">
-        <StackPanel Orientation="Vertical">
-
-
-          <TextBlock TextAlignment="Center">
-            👋 Hello and welcome!&#10;&#10;Please log in to use this connector:
-          </TextBlock>
-          <Button
-            Margin="15,40,15,15"
-            Command="{Binding LaunchManagerCommand}"
-            Content="Log In using Manager"
-            IsEnabled="{Binding IsLoggingIn, Converter={x:Static BoolConverters.Not}, FallbackValue=False}"
-            ToolTip.Tip="Manager is the reccomended way to log in and install Connectors" />
-          <TextBlock TextAlignment="Center">
-            or
-          </TextBlock>
-          <Button
-            Margin="15"
-            Command="{Binding AddAccountCommand}"
-            Content="Log In directly"
-            IsVisible="{Binding IsLoggingIn, Converter={x:Static BoolConverters.Not}, FallbackValue=False}"
-            ToolTip.Tip="Direct log in is currently only supported on our XYZ server" />
-          <StackPanel IsVisible="{Binding IsLoggingIn, FallbackValue=False}" Orientation="Vertical">
-            <TextBlock Margin="15" TextAlignment="Center">
-              ☝ Please follow the instructions in your browser.
-            </TextBlock>
-            <ProgressBar Classes="Circle" IsIndeterminate="True" />
-          </StackPanel>
-
-        </StackPanel>
+      Background="{DynamicResource MaterialDesignCardBackground}"
+      IsVisible="{Binding IsOffline, FallbackValue=False}">
+      <StackPanel
+        Margin="15"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Orientation="Vertical">
+        <TextBlock
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center"
+          Text="🏜&#x0a;You're offline"
+          TextAlignment="Center" />
+        <Button
+          Margin="20"
+          HorizontalAlignment="Center"
+          Classes="Flat"
+          Command="{Binding RefreshCommand}"
+          Content="Retry" />
+      </StackPanel>
+    </Border>
 
-      </m:Card>
 
-    </Grid>
   </Grid>
 </UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/LogInView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/LogInView.xaml
new file mode 100644
index 0000000000..1c8dd3b44b
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Pages/LogInView.xaml
@@ -0,0 +1,99 @@
+<UserControl
+  x:Class="DesktopUI2.Views.Pages.LogInView"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  d:DesignHeight="650"
+  d:DesignWidth="400"
+  mc:Ignorable="d">
+  <Grid RowDefinitions="auto, *">
+    <!--  HEADER  -->
+    <m:Card
+      Padding="15,10"
+      Background="{DynamicResource PrimaryHueMidBrush}"
+      CornerRadius="0">
+      <Grid ColumnDefinitions="auto,*">
+        <StackPanel
+          VerticalAlignment="Bottom"
+          Orientation="Horizontal"
+          Spacing="6">
+          <Image Height="30" Source="../../Assets/logo.png" />
+          <TextBlock
+            Classes="SpeckleFont"
+            FontSize="18"
+            FontWeight="Medium"
+            Foreground="White"
+            Text="{Binding Title}" />
+
+          <TextBlock
+            Margin="0,0,0,8"
+            VerticalAlignment="Bottom"
+            FontSize="8"
+            Foreground="White"
+            Text="{Binding Version}" />
+        </StackPanel>
+
+        <StackPanel
+          Grid.Column="1"
+          HorizontalAlignment="Right"
+          VerticalAlignment="Bottom"
+          Orientation="Horizontal"
+          Spacing="6" />
+      </Grid>
+    </m:Card>
+
+    <!--  NO ACCOUNTS / LOG IN  -->
+    <Grid Grid.Row="1" Margin="15">
+      <m:Card
+        Margin="10"
+        Padding="30"
+        VerticalAlignment="Top">
+        <StackPanel Orientation="Vertical">
+
+
+          <TextBlock TextAlignment="Center">
+            👋 Hello and welcome!&#10;&#10;Please log in to your Speckle account:
+          </TextBlock>
+          <Button
+            Margin="15,40,15,15"
+            Command="{Binding AddAccountCommand}"
+            Content="Log In or Register"
+            IsEnabled="{Binding !IsLoggingIn}"
+            ToolTip.Tip="A browser window will open asking you to log in" />
+          <StackPanel IsVisible="{Binding IsLoggingIn, FallbackValue=True}" Orientation="Vertical">
+            <TextBlock
+              Margin="15"
+              TextAlignment="Center"
+              TextWrapping="Wrap">
+              ☝ Please follow the instructions in your browser.
+            </TextBlock>
+            <ProgressBar
+              Margin="0,0,0,15"
+              Classes="Circle"
+              IsIndeterminate="True" />
+          </StackPanel>
+
+
+          <StackPanel IsEnabled="{Binding !IsLoggingIn}" Orientation="Horizontal">
+            <Button
+              Margin="15"
+              Classes="Flat"
+              Command="{Binding LaunchManagerCommand}"
+              Content="Launch Manager"
+              ToolTip.Tip="Manager is the reccomended way to log in and install Connectors" />
+            <Button
+              Margin="15"
+              Classes="Flat"
+              Command="{Binding RefreshCommand}"
+              Content="Refresh"
+              ToolTip.Tip="Checks if you are already logged in" />
+          </StackPanel>
+        </StackPanel>
+
+      </m:Card>
+
+    </Grid>
+  </Grid>
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/LogInView.xaml.cs b/DesktopUI2/DesktopUI2/Views/Pages/LogInView.xaml.cs
new file mode 100644
index 0000000000..3e225adb16
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Pages/LogInView.xaml.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+using DesktopUI2.ViewModels;
+using ReactiveUI;
+
+namespace DesktopUI2.Views.Pages
+{
+  public partial class LogInView : ReactiveUserControl<LogInViewModel>
+  {
+
+    public LogInView()
+    {
+      this.WhenActivated(disposables => { });
+      AvaloniaXamlLoader.Load(this);
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/NotificationsView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/NotificationsView.xaml
new file mode 100644
index 0000000000..4e833e2e36
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Pages/NotificationsView.xaml
@@ -0,0 +1,124 @@
+<UserControl
+  x:Class="DesktopUI2.Views.Pages.NotificationsView"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:dvm="clr-namespace:DesktopUI2.ViewModels.DesignViewModels"
+  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  d:DesignHeight="450"
+  d:DesignWidth="400"
+  mc:Ignorable="d">
+  <Design.DataContext>
+    <dvm:DesignNotificationsViewModel />
+  </Design.DataContext>
+  <Grid RowDefinitions="auto,*">
+    <Border
+      Margin="0,0,0,7"
+      Padding="0"
+      assists:ShadowAssist.ShadowDepth="Depth2"
+      Background="{DynamicResource PrimaryHueMidBrush}">
+      <Grid Margin="15" ColumnDefinitions="auto,*,auto, auto">
+        <m:FloatingButton
+          VerticalAlignment="Center"
+          assists:ShadowAssist.ShadowDepth="0"
+          Background="Transparent"
+          Classes=""
+          Command="{Binding GoBack}"
+          ToolTip.Tip="Back">
+          <Button.Content>
+            <Viewbox
+              HorizontalAlignment="Stretch"
+              VerticalAlignment="Stretch"
+              Stretch="Fill">
+              <icons:MaterialIcon
+                Width="24"
+                Height="24"
+                Foreground="White"
+                Kind="ChevronLeft" />
+            </Viewbox>
+          </Button.Content>
+        </m:FloatingButton>
+        <TextBlock
+          Grid.Column="1"
+          Margin="15,0,0,0"
+          VerticalAlignment="Center"
+          Classes="Medium"
+          FontSize="20"
+          Foreground="White"
+          Text="Notifications"
+          TextTrimming="CharacterEllipsis" />
+
+      </Grid>
+    </Border>
+
+    <ScrollViewer Grid.Row="1">
+      <Grid RowDefinitions="*,auto">
+        <StackPanel
+          Margin="10,15"
+          HorizontalAlignment="Center"
+          IsVisible="{Binding !Notifications.Count}"
+          Orientation="Vertical"
+          Spacing="20">
+          <TextBlock Text="😴 There are no new notifications!" TextWrapping="Wrap" />
+        </StackPanel>
+
+        <ItemsControl Margin="0,0,0,10" Items="{Binding Notifications}">
+          <ItemsControl.ItemTemplate>
+            <DataTemplate>
+              <m:Card Margin="15,10">
+                <Grid ColumnDefinitions="auto,*,auto">
+                  <icons:MaterialIcon
+                    Width="20"
+                    Height="20"
+                    Foreground="{Binding IconColor}"
+                    IsVisible="{Binding Icon}"
+                    Kind="{Binding Icon}" />
+
+                  <Image
+                    Width="30"
+                    Height="30"
+                    IsVisible="{Binding User}"
+                    Source="{Binding User.AvatarImage}"
+                    ToolTip.Tip="{Binding User.Name}">
+                    <Image.Clip>
+                      <EllipseGeometry Rect="0,0,30,30" />
+                    </Image.Clip>
+                  </Image>
+
+                  <TextBlock
+                    Grid.Column="1"
+                    Margin="5,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding Message}"
+                    TextWrapping="Wrap" />
+
+                  <m:FloatingButton
+                    Grid.Column="2"
+                    VerticalAlignment="Center"
+                    Command="{Binding LaunchCommand, FallbackValue={x:Null}}"
+                    ToolTip.Tip="View">
+                    <Button.Content>
+                      <icons:MaterialIcon
+                        Width="20"
+                        Height="20"
+                        Foreground="White"
+                        Kind="OpenInNew" />
+                    </Button.Content>
+                  </m:FloatingButton>
+                </Grid>
+              </m:Card>
+            </DataTemplate>
+          </ItemsControl.ItemTemplate>
+
+        </ItemsControl>
+
+      </Grid>
+
+    </ScrollViewer>
+  </Grid>
+
+
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/NotificationsView.xaml.cs b/DesktopUI2/DesktopUI2/Views/Pages/NotificationsView.xaml.cs
new file mode 100644
index 0000000000..3da7364762
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Pages/NotificationsView.xaml.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+using DesktopUI2.ViewModels;
+using ReactiveUI;
+
+namespace DesktopUI2.Views.Pages
+{
+  public partial class NotificationsView : ReactiveUserControl<NotificationsViewModel>
+  {
+    public NotificationsView()
+    {
+      this.WhenActivated(disposables => { });
+      AvaloniaXamlLoader.Load(this);
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/OneClickView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/OneClickView.xaml
new file mode 100644
index 0000000000..11098a6807
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Pages/OneClickView.xaml
@@ -0,0 +1,326 @@
+<UserControl
+  x:Class="DesktopUI2.Views.Pages.OneClickView"
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  d:DesignHeight="550"
+  d:DesignWidth="400"
+  mc:Ignorable="d">
+  <UserControl.Styles>
+    <Style Selector="icons|MaterialIcon#send">
+      <Setter Property="RenderTransform" Value="rotate(-30deg)" />
+    </Style>
+    <Style Selector="m|FloatingButton:pointerover icons|MaterialIcon#send">
+      <Setter Property="RenderTransform" Value="rotate(-45deg)" />
+    </Style>
+  </UserControl.Styles>
+  <Grid>
+
+
+    <Grid RowDefinitions="auto, *">
+      <!--  HEADER  -->
+      <m:Card
+        Padding="15,10"
+        Background="{DynamicResource PrimaryHueMidBrush}"
+        CornerRadius="0">
+        <Grid ColumnDefinitions="auto,*">
+          <StackPanel
+            VerticalAlignment="Bottom"
+            Orientation="Horizontal"
+            Spacing="6">
+            <Image Height="30" Source="../../Assets/logo.png" />
+            <TextBlock
+              Classes="SpeckleFont"
+              FontSize="18"
+              FontWeight="Medium"
+              Foreground="White"
+              Text="{Binding Title}" />
+
+            <TextBlock
+              Margin="0,0,0,8"
+              VerticalAlignment="Bottom"
+              FontSize="8"
+              Foreground="White"
+              Text="{Binding Version}" />
+          </StackPanel>
+
+          <StackPanel
+            Grid.Column="1"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Bottom"
+            Orientation="Horizontal"
+            Spacing="6">
+
+
+            <!--  UPDATE NOTIFICATION  -->
+            <!--<Menu
+              VerticalAlignment="Center"
+              IsVisible="{Binding HasUpdate}"
+              ToolTip.Tip="Update available">
+              <MenuItem
+                Width="30"
+                Height="30"
+                Foreground="Red"
+                Header="{icons:MaterialIconExt Notifications}">
+                <MenuItem
+                  Command="{Binding LaunchManagerCommand}"
+                  Header="An update for this connector is available, install it now!"
+                  Icon="{icons:MaterialIconExt ExternalLink}" />
+              </MenuItem>
+            </Menu>-->
+
+          </StackPanel>
+        </Grid>
+      </m:Card>
+
+      <!--  MAIN BODY SEND  -->
+      <Grid
+        Grid.Row="1"
+        Margin="5,10,5,5"
+        IsVisible="{Binding HasAccounts}"
+        RowDefinitions="*,auto">
+        <StackPanel
+          Margin="40"
+          VerticalAlignment="Center"
+          Orientation="Vertical"
+          Spacing="20">
+          <Button
+            Command="{Binding Send}"
+            CornerRadius="40"
+            IsDefault="True"
+            IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}, FallbackValue=True}"
+            ToolTip.Tip="Send the current model to Speckle">
+            <Button.Content>
+              <StackPanel
+                Margin="10"
+                Orientation="Horizontal"
+                Spacing="12">
+
+                <icons:MaterialIcon
+                  Name="send"
+                  Width="20"
+                  Height="20"
+                  Foreground="White"
+                  Kind="CubeSend">
+                  <icons:MaterialIcon.Transitions>
+                    <Transitions>
+                      <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" />
+                    </Transitions>
+                  </icons:MaterialIcon.Transitions>
+                </icons:MaterialIcon>
+                <TextBlock
+                  Classes="ButtonText"
+                  FontWeight="Bold"
+                  Text="SEND" />
+              </StackPanel>
+
+            </Button.Content>
+          </Button>
+          <TextBlock
+            Opacity="0.5"
+            Text="💡 Send the whole model or just the selected objects"
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+        </StackPanel>
+
+
+        <Button
+          Grid.Row="1"
+          Margin="5"
+          Classes="Flat Mini"
+          Command="{Binding AdvancedModeCommand}">
+          <Button.Content>
+            <StackPanel
+              Margin="10"
+              Orientation="Horizontal"
+              Spacing="12">
+              <icons:MaterialIcon
+                Width="15"
+                Height="15"
+                Foreground="{DynamicResource PrimaryHueDarkBrush}"
+                Kind="SwapHorizontalVariant" />
+              <TextBlock Classes="ButtonText" Text="Switch to Advanced mode" />
+            </StackPanel>
+          </Button.Content>
+        </Button>
+      </Grid>
+
+      <!--  NO ACCOUNTS  -->
+      <Grid
+        Grid.Row="1"
+        Margin="15"
+        IsVisible="{Binding HasAccounts, Converter={x:Static BoolConverters.Not}, FallbackValue=False}">
+        <m:Card
+          Margin="10"
+          Padding="30"
+          VerticalAlignment="Top">
+          <StackPanel Orientation="Vertical">
+
+
+            <TextBlock TextAlignment="Center">
+              👋 Hello and welcome!&#10;&#10;Please log in to use this connector:
+            </TextBlock>
+            <Button
+              Margin="15,40,15,15"
+              Command="{Binding LaunchManagerCommand}"
+              Content="Log In using Manager"
+              IsEnabled="{Binding IsLoggingIn, Converter={x:Static BoolConverters.Not}, FallbackValue=False}"
+              ToolTip.Tip="Manager is the reccomended way to log in and install Connectors" />
+            <TextBlock TextAlignment="Center">
+              or
+            </TextBlock>
+            <Button
+              Margin="15"
+              Command="{Binding AddAccountCommand}"
+              Content="Log In directly"
+              IsVisible="{Binding IsLoggingIn, Converter={x:Static BoolConverters.Not}, FallbackValue=False}"
+              ToolTip.Tip="Direct log in is currently only supported on our XYZ server" />
+            <StackPanel IsVisible="{Binding IsLoggingIn, FallbackValue=False}" Orientation="Vertical">
+              <TextBlock Margin="15" TextAlignment="Center">
+                ☝ Please follow the instructions in your browser.
+              </TextBlock>
+              <ProgressBar Classes="Circle" IsIndeterminate="True" />
+            </StackPanel>
+
+          </StackPanel>
+
+        </m:Card>
+
+      </Grid>
+    </Grid>
+
+    <!--  SENDING & SENT COMPLETED POPUP  -->
+    <Border Background="{DynamicResource PrimaryHueMidBrush}" IsVisible="{Binding SendClicked, FallbackValue=True}">
+      <Grid RowDefinitions="*">
+        <m:FloatingButton
+          Margin="0,20,20,0"
+          HorizontalAlignment="Right"
+          VerticalAlignment="Top"
+          assists:ShadowAssist.ShadowDepth="0"
+          Background="Transparent"
+          Classes=""
+          Command="{Binding CloseSendModal}"
+          ToolTip.Tip="Close">
+          <Button.Content>
+            <Viewbox
+              HorizontalAlignment="Stretch"
+              VerticalAlignment="Stretch"
+              Stretch="Fill">
+              <icons:MaterialIcon
+                Width="24"
+                Height="24"
+                Foreground="White"
+                Kind="Close" />
+            </Viewbox>
+          </Button.Content>
+        </m:FloatingButton>
+        <!--  SENDING  -->
+        <StackPanel
+          Grid.Row="1"
+          Margin="20"
+          HorizontalAlignment="Stretch"
+          VerticalAlignment="Center"
+          IsVisible="{Binding Progress.IsProgressing}"
+          Orientation="Vertical"
+          Spacing="15">
+          <TextBlock
+            Classes="Subtitle1"
+            Foreground="White"
+            Text="{Binding Progress.ProgressTitle, FallbackValue='Operation XYZ'}"
+            TextTrimming="CharacterEllipsis" />
+          <ProgressBar
+            Classes="notransitions"
+            IsIndeterminate="{Binding Progress.IsIndeterminate, FallbackValue=True}"
+            IsVisible="{Binding Progress.IsProgressing}"
+            Maximum="{Binding Progress.Max}"
+            Value="{Binding Progress.Value}" />
+          <TextBlock
+            Foreground="White"
+            Text="{Binding Progress.ProgressSummary, FallbackValue='Operation in progress...'}"
+            TextTrimming="CharacterEllipsis" />
+        </StackPanel>
+
+        <!--  SEND COMPLETED  -->
+        <StackPanel
+          Grid.Row="1"
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center"
+          IsVisible="{Binding !Progress.IsProgressing}"
+          Orientation="Vertical">
+          <TextBlock
+            Margin="30"
+            HorizontalAlignment="Center"
+            Classes="Subtitle1"
+            Foreground="White"
+            Text="{Binding SentText}"
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+          <Button
+            Margin="0"
+            HorizontalAlignment="Center"
+            Background="White"
+            Command="{Binding ViewOnlineCommand}"
+            CornerRadius="25"
+            Foreground="{DynamicResource PrimaryHueMidBrush}"
+            IsVisible="{Binding SuccessfulSend}">
+            <Grid Margin="0" ColumnDefinitions="auto,*">
+
+              <icons:MaterialIcon VerticalAlignment="Center" Kind="ExternalLink" />
+              <TextBlock
+                Grid.Column="1"
+                Margin="8,0"
+                Padding="0"
+                VerticalAlignment="Center"
+                Text="View online"
+                TextTrimming="CharacterEllipsis" />
+            </Grid>
+          </Button>
+          <Button
+            Margin="0,20,0,0"
+            HorizontalAlignment="Center"
+            Classes="Flat"
+            Command="{Binding ShareCommand}"
+            CornerRadius="25"
+            Foreground="White"
+            IsVisible="{Binding SuccessfulSend}">
+            <Grid Margin="0" ColumnDefinitions="auto,*">
+
+              <icons:MaterialIcon VerticalAlignment="Center" Kind="UsersAdd" />
+              <TextBlock
+                Grid.Column="1"
+                Margin="8,0"
+                Padding="0"
+                VerticalAlignment="Center"
+                Text="Enable multiplayer mode!"
+                TextTrimming="CharacterEllipsis" />
+            </Grid>
+          </Button>
+          <Button
+            Margin="0,5,0,40"
+            HorizontalAlignment="Center"
+            Classes="Flat"
+            Command="{Binding CopyCommand}"
+            CornerRadius="25"
+            Foreground="White"
+            IsVisible="{Binding SuccessfulSend}">
+            <Grid Margin="0" ColumnDefinitions="auto,*">
+
+              <icons:MaterialIcon VerticalAlignment="Center" Kind="LinkVariant" />
+              <TextBlock
+                Grid.Column="1"
+                Margin="8,0"
+                Padding="0"
+                VerticalAlignment="Center"
+                Text="Copy URL to clipboard"
+                TextTrimming="CharacterEllipsis" />
+            </Grid>
+          </Button>
+        </StackPanel>
+      </Grid>
+    </Border>
+  </Grid>
+</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/OneClickView.xaml.cs b/DesktopUI2/DesktopUI2/Views/Pages/OneClickView.xaml.cs
new file mode 100644
index 0000000000..567604fdbe
--- /dev/null
+++ b/DesktopUI2/DesktopUI2/Views/Pages/OneClickView.xaml.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+using DesktopUI2.ViewModels;
+using ReactiveUI;
+
+namespace DesktopUI2.Views.Pages
+{
+  public partial class OneClickView : ReactiveUserControl<OneClickViewModel>
+  {
+    public OneClickView()
+    {
+      this.WhenActivated(disposables => { });
+      AvaloniaXamlLoader.Load(this);
+    }
+  }
+}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/AddCollaborators.xaml.cs b/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/AddCollaborators.xaml.cs
deleted file mode 100644
index f7cac3a635..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/AddCollaborators.xaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
-using DesktopUI2.ViewModels.Share;
-using ReactiveUI;
-
-namespace DesktopUI2.Views.Pages.ShareControls
-{
-  public partial class AddCollaborators : ReactiveUserControl<AddCollaboratorsViewModel>
-  {
-    public static AddCollaborators Instance { get; private set; }
-    public AddCollaborators()
-    {
-      InitializeComponent();
-      Instance = this;
-    }
-
-    private void InitializeComponent()
-    {
-      this.WhenActivated(disposables => { });
-      AvaloniaXamlLoader.Load(this);
-    }
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/CollaboratorsView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/CollaboratorsView.xaml
deleted file mode 100644
index a9d79cb9a6..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/CollaboratorsView.xaml
+++ /dev/null
@@ -1,305 +0,0 @@
-<UserControl
-  x:Class="DesktopUI2.Views.Pages.ShareControls.CollaboratorsView"
-  xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-  xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  xmlns:p="clr-namespace:DesktopUI2.Views.Pages"
-  xmlns:reactiveUi="http://reactiveui.net"
-  xmlns:vm="using:DesktopUI2.ViewModels.DesignViewModels"
-  d:DesignHeight="450"
-  d:DesignWidth="800"
-  mc:Ignorable="d">
-  <UserControl.Resources>
-    <conv:RoleValueConverter x:Key="RoleValueConverter" />
-    <conv:RoleCanShareValueConverter x:Key="RoleCanShareValueConverter" />
-    <conv:RoleCannotShareValueConverter x:Key="RoleCannotShareValueConverter" />
-  </UserControl.Resources>
-  <Grid RowDefinitions="auto,*">
-    <Border
-      Margin="0,0,0,7"
-      Padding="0"
-      assists:ShadowAssist.ShadowDepth="Depth2"
-      Background="{DynamicResource PrimaryHueMidBrush}">
-      <Grid Margin="15" ColumnDefinitions="auto,*,auto, auto">
-        <m:FloatingButton
-          VerticalAlignment="Center"
-          assists:ShadowAssist.ShadowDepth="0"
-          Background="Transparent"
-          Classes=""
-          Command="{Binding GoBack}"
-          ToolTip.Tip="Back">
-          <Button.Content>
-            <Viewbox
-              HorizontalAlignment="Stretch"
-              VerticalAlignment="Stretch"
-              Stretch="Fill">
-              <icons:MaterialIcon
-                Width="24"
-                Height="24"
-                Foreground="White"
-                Kind="ChevronLeft" />
-            </Viewbox>
-          </Button.Content>
-        </m:FloatingButton>
-        <TextBlock
-          Grid.Column="1"
-          Margin="15,0,0,0"
-          VerticalAlignment="Center"
-          Classes="Medium SpeckleFont"
-          FontSize="20"
-          Foreground="White"
-          Text="Collaborators"
-          TextTrimming="CharacterEllipsis" />
-
-      </Grid>
-    </Border>
-
-    <Grid
-      Grid.Row="1"
-      Margin="15"
-      RowDefinitions="auto, auto, auto, *, auto">
-      <TextBlock
-        Margin="10,0,10,10"
-        IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}}"
-        Text="Manage your collaborators or invite new ones by name or email:"
-        TextWrapping="Wrap" />
-
-      <TextBlock
-        Margin="10,0,10,10"
-        IsVisible="{Binding Role, Converter={StaticResource RoleCannotShareValueConverter}}"
-        Text="You don't have permission to manage collaborators on this stream."
-        TextWrapping="Wrap" />
-      <Grid
-        Grid.Row="1"
-        Margin="0,10,0,0"
-        IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}}">
-        <ComboBox
-          Margin="8,19,8,0"
-          Classes="Stealth"
-          IsDropDownOpen="{Binding DropDownOpen, FallbackValue=True}"
-          Items="{Binding Users}"
-          SelectedItem="{Binding SelectedUser}">
-          <ComboBox.ItemTemplate>
-            <DataTemplate>
-              <Grid ColumnDefinitions="auto,*">
-                <icons:MaterialIcon
-                  Width="28"
-                  Height="28"
-                  Margin="0,0,5,0"
-                  Foreground="DarkGray"
-                  IsVisible="{Binding AvatarImage, Converter={x:Static ObjectConverters.IsNull}}"
-                  Kind="Email" />
-
-                <Image
-                  Width="28"
-                  Height="28"
-                  IsVisible="{Binding AvatarImage, Converter={x:Static ObjectConverters.IsNotNull}}"
-                  Source="{Binding AvatarImage}">
-                  <Image.Clip>
-                    <EllipseGeometry Rect="0,0,28,28" />
-                  </Image.Clip>
-                </Image>
-
-
-                <TextBlock
-                  Grid.Column="1"
-                  Margin="5,0,0,0"
-                  VerticalAlignment="Center"
-                  Text="{Binding Name}"
-                  TextTrimming="CharacterEllipsis" />
-              </Grid>
-            </DataTemplate>
-          </ComboBox.ItemTemplate>
-        </ComboBox>
-        <m:Card Padding="0" CornerRadius="25">
-          <!--  SEARCH USERS  -->
-          <TextBox
-            Name="SearchBox"
-            Margin="0"
-            Padding="0"
-            Classes="Solo Small"
-            Text="{Binding SearchQuery}"
-            Watermark="Search users or type email">
-            <TextBox.InnerRightContent>
-              <Button
-                Width="{Binding $self.Bounds.Height}"
-                Padding="4"
-                Classes="Flat"
-                Command="{Binding ClearSearchCommand}"
-                Content="{icons:MaterialIconExt CloseCircle,
-                                                Size=15}" />
-            </TextBox.InnerRightContent>
-            <TextBox.InnerLeftContent>
-              <icons:MaterialIcon
-                Width="15"
-                Height="15"
-                Margin="10,0,0,0"
-                Kind="Search" />
-            </TextBox.InnerLeftContent>
-          </TextBox>
-        </m:Card>
-
-      </Grid>
-      <ProgressBar
-        Grid.Row="2"
-        Margin="12,5"
-        IsIndeterminate="True"
-        IsVisible="{Binding ShowProgress, FallbackValue=True}" />
-
-      <m:Card
-        Grid.Row="3"
-        Margin="0,15"
-        VerticalAlignment="Stretch"
-        HorizontalContentAlignment="Stretch"
-        Classes="Mini"
-        IsVisible="{Binding HasAddedUsers}">
-        <ScrollViewer VerticalScrollBarVisibility="Auto">
-          <ListBox
-            x:Name="ItemsListBox"
-            Margin="0"
-            Classes="Chip Avatar"
-            Items="{Binding AddedUsers}"
-            Selection="{Binding SelectionModel}"
-            SelectionMode="Multiple, Toggle">
-            <ListBox.ItemTemplate>
-              <DataTemplate>
-                <Grid
-                  Margin="0"
-                  ColumnDefinitions="Auto,*"
-                  RowDefinitions="auto,auto">
-
-                  <!--<Grid Margin="0" IsVisible="{Binding AvatarUrl, Converter={x:Static StringConverters.IsNullOrEmpty}}">
-                  <Path
-                    Width="28"
-                    Height="28"
-                    Fill="{DynamicResource PrimaryHueMidBrush}">
-                    <Path.Data>
-                      <CombinedGeometry GeometryCombineMode="Xor">
-                        <CombinedGeometry.Geometry1>
-                          <PathGeometry Figures="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
-                        </CombinedGeometry.Geometry1>
-                        <CombinedGeometry.Geometry2>
-                          <EllipseGeometry Rect="-2,-2,28,28" />
-                        </CombinedGeometry.Geometry2>
-                      </CombinedGeometry>
-                    </Path.Data>
-                  </Path>
-                </Grid>-->
-
-                  <icons:MaterialIcon
-                    Grid.RowSpan="2"
-                    Width="32"
-                    Height="32"
-                    Margin="5,0,0,0"
-                    Foreground="DarkGray"
-                    IsVisible="{Binding AvatarImage, Converter={x:Static ObjectConverters.IsNull}}"
-                    Kind="Email" />
-
-                  <Image
-                    Grid.RowSpan="2"
-                    Width="38"
-                    Height="38"
-                    IsVisible="{Binding AvatarImage, Converter={x:Static ObjectConverters.IsNotNull}}"
-                    Source="{Binding AvatarImage}">
-
-                    <Image.Clip>
-                      <EllipseGeometry Rect="0,0,38,38" />
-                    </Image.Clip>
-                  </Image>
-                  <TextBlock
-                    Grid.Column="1"
-                    Margin="5,5,5,0"
-                    Padding="0"
-                    VerticalAlignment="Bottom"
-                    Text="{Binding Name}"
-                    TextTrimming="CharacterEllipsis" />
-                  <TextBlock
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="5,0,5,5"
-                    Padding="0"
-                    VerticalAlignment="Top"
-                    Classes="Overline"
-                    Text="{Binding Role, Converter={StaticResource RoleValueConverter}}"
-                    TextTrimming="CharacterEllipsis" />
-
-                </Grid>
-
-
-
-              </DataTemplate>
-            </ListBox.ItemTemplate>
-          </ListBox>
-        </ScrollViewer>
-      </m:Card>
-
-
-
-      <StackPanel
-        Grid.Row="4"
-        Grid.ColumnSpan="2"
-        Margin="0,10,0,0"
-        HorizontalAlignment="Right"
-        Orientation="Horizontal"
-        Spacing="5">
-
-        <Button
-          Classes="Flat"
-          Command="{Binding RemoveSeletedUsersCommand}"
-          CornerRadius="25 "
-          Foreground="Red"
-          IsEnabled="{Binding HasSelectedUsers}"
-          IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}}"
-          ToolTip.Tip="Remove selected users and emails">
-          <Grid Margin="0" ColumnDefinitions="auto,*">
-
-            <icons:MaterialIcon VerticalAlignment="Center" Kind="AccountMinus" />
-            <TextBlock
-              Grid.Column="1"
-              Margin="8,0"
-              Padding="0"
-              VerticalAlignment="Center"
-              Text="Remove"
-              TextTrimming="CharacterEllipsis" />
-          </Grid>
-        </Button>
-        <Button
-          Classes="Flat"
-          Command="{Binding ChangeRoleSeletedUsersCommand}"
-          CornerRadius="25 "
-          IsEnabled="{Binding HasSelectedUsers}"
-          IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}}"
-          ToolTip.Tip="Change the role for the selected users">
-          <Grid Margin="0" ColumnDefinitions="auto,*">
-
-            <icons:MaterialIcon VerticalAlignment="Center" Kind="AccountCog" />
-            <TextBlock
-              Grid.Column="1"
-              Margin="8,0"
-              Padding="0"
-              VerticalAlignment="Center"
-              Text="Change role"
-              TextTrimming="CharacterEllipsis" />
-          </Grid>
-        </Button>
-        <Button
-          Command="{Binding SaveCommand}"
-          Content="Save"
-          CornerRadius="25 "
-          IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}}"
-          ToolTip.Tip="Save your changes and invite the new collaborators" />
-        <Button
-          Command="{Binding CloseCommand}"
-          Content="Close"
-          CornerRadius="25 "
-          IsVisible="{Binding Role, Converter={StaticResource RoleCanShareValueConverter}, ConverterParameter=not}" />
-      </StackPanel>
-    </Grid>
-  </Grid>
-
-</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/Sending.xaml b/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/Sending.xaml
deleted file mode 100644
index cfb4ecdbcb..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/Sending.xaml
+++ /dev/null
@@ -1,119 +0,0 @@
-<UserControl
-  x:Class="DesktopUI2.Views.Pages.ShareControls.Sending"
-  xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  assists:ShadowAssist.ShadowDepth="10"
-  d:DesignHeight="250"
-  d:DesignWidth="600"
-  Background="{DynamicResource PrimaryHueMidBrush}"
-  mc:Ignorable="d">
-  <Grid>
-    <Grid IsVisible="{Binding SendComplete, Converter={x:Static BoolConverters.Not}, FallbackValue=False}" RowDefinitions="auto, auto, auto, auto">
-      <TextBlock
-        Margin="15,15,15,0"
-        Classes="Subtitle1"
-        Foreground="White"
-        Text="{Binding Progress.ProgressTitle, FallbackValue='Operation X'}"
-        TextTrimming="CharacterEllipsis" />
-      <ProgressBar
-        Grid.Row="1"
-        Margin="15,15,15,0"
-        IsIndeterminate="{Binding Progress.IsIndeterminate, FallbackValue=True}"
-        IsVisible="{Binding Progress.IsProgressing}"
-        Maximum="{Binding Max}"
-        Value="{Binding Value}" />
-      <TextBlock
-        Grid.Row="2"
-        Margin="15,15,15,0"
-        Foreground="White"
-        Text="{Binding Progress.ProgressSummary, FallbackValue='Operation in progress...'}"
-        TextTrimming="CharacterEllipsis" />
-      <StackPanel
-        Grid.Row="3"
-        Margin="15"
-        HorizontalAlignment="Right"
-        Orientation="Horizontal">
-        <Button
-          Margin="0,0,10,0"
-          Classes="Outline"
-          Command="{Binding Progress.CancelCommand}"
-          Content="Cancel"
-          Foreground="White"
-          IsVisible="{Binding Progress.IsProgressing}" />
-        <!--<Button
-        Margin="0,0,10,0"
-        Classes="Outline"
-        Command="{Binding Progress.OpenReportCommand}"
-        Content="Open Report"
-        Foreground="White"
-        IsVisible="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}}" />-->
-        <!--<Button
-        Margin="0,0,10,0"
-        Background="White"
-        Click="Close_Click"
-        Content="Close"
-        Foreground="{DynamicResource PrimaryHueMidBrush}"
-        IsEnabled="{Binding IsProgressing, Converter={x:Static BoolConverters.Not}}" />-->
-      </StackPanel>
-    </Grid>
-
-    <Grid
-      HorizontalAlignment="Center"
-      IsVisible="{Binding SendComplete, FallbackValue=True}"
-      RowDefinitions="auto, auto, auto, auto">
-      <TextBlock
-        Margin="30"
-        HorizontalAlignment="Center"
-        Classes="Subtitle1"
-        Foreground="White"
-        Text="Done 🎉! Your model has been shared successfully"
-        TextTrimming="CharacterEllipsis" />
-      <Button
-        Grid.Row="1"
-        Margin="0"
-        HorizontalAlignment="Center"
-        CornerRadius="25"
-        Background="White"
-        Command="{Binding ViewOnlineCommand}"
-        Content="Cancel"
-        Foreground="{DynamicResource PrimaryHueMidBrush}">
-        <Grid Margin="0" ColumnDefinitions="auto,*">
-
-          <icons:MaterialIcon VerticalAlignment="Center" Kind="ExternalLink" />
-          <TextBlock
-            Grid.Column="1"
-            Margin="8,0"
-            Padding="0"
-            VerticalAlignment="Center"
-            Text="View online"
-            TextTrimming="CharacterEllipsis" />
-        </Grid>
-      </Button>
-      <Button
-        Grid.Row="2"
-        Margin="0,20,0,40"
-        HorizontalAlignment="Center"
-        CornerRadius="25"
-        Classes="Flat"
-        Command="{Binding CopyCommand}"
-        Content="Cancel"
-        Foreground="White">
-        <Grid Margin="0" ColumnDefinitions="auto,*">
-
-          <icons:MaterialIcon VerticalAlignment="Center" Kind="LinkVariant" />
-          <TextBlock
-            Grid.Column="1"
-            Margin="8,0"
-            Padding="0"
-            VerticalAlignment="Center"
-            Text="Copy URL to clipboard"
-            TextTrimming="CharacterEllipsis" />
-        </Grid>
-      </Button>
-    </Grid>
-  </Grid>
-</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/Sending.xaml.cs b/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/Sending.xaml.cs
deleted file mode 100644
index 29aeb8405e..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/Sending.xaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
-using DesktopUI2.ViewModels.Share;
-
-namespace DesktopUI2.Views.Pages.ShareControls
-{
-  public partial class Sending : ReactiveUserControl<SendingViewModel>
-  {
-    public Sending()
-    {
-      InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-      AvaloniaXamlLoader.Load(this);
-    }
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Receive.xaml b/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Receive.xaml
deleted file mode 100644
index 4a03bc5d25..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Receive.xaml
+++ /dev/null
@@ -1,228 +0,0 @@
-<UserControl
-  x:Class="DesktopUI2.Views.Pages.StreamEditControls.Receive"
-  xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-  xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  xmlns:viewModels="clr-namespace:DesktopUI2.ViewModels"
-  d:DesignHeight="450"
-  d:DesignWidth="400"
-  mc:Ignorable="d">
-  <Grid RowDefinitions="auto, auto">
-
-    <Expander
-      Padding="15,0"
-      HorizontalAlignment="Stretch"
-      HorizontalContentAlignment="Stretch"
-      Background="Transparent"
-      Classes="Flat"
-      IsExpanded="{Binding IsExpanded}">
-      <Expander.Header>
-        <StackPanel Orientation="Horizontal">
-          <TextBlock Text="Receiving " />
-          <TextBlock FontWeight="Bold" Text="{Binding SelectedCommit.id, FallbackValue=?}" />
-          <TextBlock Text=" from " />
-          <TextBlock FontWeight="Bold" Text="{Binding SelectedBranch.Branch.name, FallbackValue=?}" />
-          <TextBlock
-            Classes="Overline"
-            Foreground="Gray"
-            Text="  (expand to edit)" />
-        </StackPanel>
-      </Expander.Header>
-      <Grid
-        Margin="15,0"
-        ColumnDefinitions="auto,*, auto, *"
-        RowDefinitions="auto, auto,auto,auto">
-
-        <!--  SELECT BRANCH  -->
-        <icons:MaterialIcon
-          Margin="0"
-          VerticalAlignment="Center"
-          Foreground="Gray"
-          Kind="InfoCircle"
-          ToolTip.Tip="Data in a stream can be organized in branches,&#x0a;for instance, to have multiple design options&#x0a;or to store data by discipline.&#x0a;The default branch is called main." />
-        <ComboBox
-          Grid.Column="1"
-          Margin="5,10,5,10"
-          HorizontalAlignment="Stretch"
-          VerticalAlignment="Center"
-          Items="{Binding BranchesViewModel}"
-          PlaceholderText="Select a branch"
-          SelectedItem="{Binding SelectedBranch}">
-          <ComboBox.ItemTemplate>
-            <DataTemplate>
-              <Grid ColumnDefinitions="auto,*">
-                <icons:MaterialIcon
-                  Margin="0,0,5,0"
-                  Foreground="DarkGray"
-                  Kind="{Binding Icon}" />
-                <TextBlock
-                  Grid.Column="1"
-                  Text="{Binding Branch.name}"
-                  TextTrimming="CharacterEllipsis" />
-              </Grid>
-            </DataTemplate>
-          </ComboBox.ItemTemplate>
-        </ComboBox>
-        <!--  SELECT COMMIT  -->
-        <icons:MaterialIcon
-          Grid.Column="2"
-          Margin="0"
-          VerticalAlignment="Center"
-          Foreground="Gray"
-          Kind="InfoCircle"
-          ToolTip.Tip="A commit is a snapshot in time&#x0a;of the data inside a branch.&#x0a;Every time you send to Speckle from a connector,&#x0a;a commit is created." />
-        <ComboBox
-          Grid.Column="3"
-          Margin="5,10,0,10"
-          HorizontalAlignment="Stretch"
-          VerticalAlignment="Center"
-          IsEnabled="{Binding HasCommits}"
-          Items="{Binding Commits}"
-          PlaceholderText="Select a commit"
-          SelectedIndex="0"
-          SelectedItem="{Binding SelectedCommit}">
-          <ComboBox.ItemTemplate>
-            <DataTemplate>
-              <Grid ColumnDefinitions="auto,auto,auto,*">
-
-                <icons:MaterialIcon
-                  Margin="0,0,5,0"
-                  Foreground="DarkGray"
-                  Kind="SourceCommit" />
-                <TextBlock
-                  Grid.Column="1"
-                  Text="{Binding id}"
-                  TextTrimming="CharacterEllipsis" />
-                <TextBlock Grid.Column="2" Text=" | " />
-                <TextBlock
-                  Grid.Column="3"
-                  Text="{Binding message}"
-                  TextTrimming="CharacterEllipsis" />
-              </Grid>
-            </DataTemplate>
-          </ComboBox.ItemTemplate>
-        </ComboBox>
-        <!--  RECEIVE MODE  -->
-        <icons:MaterialIcon
-          Grid.Row="1"
-          Margin="0"
-          VerticalAlignment="Center"
-          Foreground="Gray"
-          Kind="InfoCircle"
-          ToolTip.Tip="Decide what to do when an element being received already exists.&#x0a;UPDATE: attempts to update existing elements&#x0a;CREATE: always creates a new element&#x0a;IGNORE: skips already existing elements" />
-        <ComboBox
-          Grid.Row="1"
-          Grid.Column="1"
-          Margin="5,10,5,10"
-          HorizontalAlignment="Stretch"
-          VerticalAlignment="Center"
-          Items="{Binding ReceiveModes}"
-          PlaceholderText="Select a receive mode"
-          SelectedItem="{Binding SelectedReceiveMode}" />
-        <!--  AUTO RECEIVE  -->
-        <icons:MaterialIcon
-          Grid.Row="1"
-          Grid.Column="2"
-          Margin="0"
-          VerticalAlignment="Center"
-          Foreground="Gray"
-          Kind="InfoCircle"
-          ToolTip.Tip="Automatically receive new data&#x0a;when it is sent to this branch.&#x0a;NOTE: use with caution!" />
-        <ToggleSwitch
-          Grid.Row="1"
-          Grid.Column="3"
-          Margin="5,10,0,10"
-          HorizontalAlignment="Stretch"
-          VerticalAlignment="Center"
-          Content="Auto Receive"
-          IsChecked="{Binding AutoReceive}" />
-
-        <!--  NO COMMIT INFO  -->
-        <m:Card
-          Grid.Row="2"
-          Grid.ColumnSpan="4"
-          Margin="0,10"
-          VerticalAlignment="Stretch"
-          HorizontalContentAlignment="Stretch"
-          Classes="Mini">
-          <StackPanel>
-            <TextBlock
-              IsVisible="{Binding HasCommits, Converter={x:Static BoolConverters.Not}}"
-              Text="This branch has no commits. Commits are generated what data is sent to a Stream.&#x0a;&#x0a;Please select a different branch or stream."
-              TextWrapping="Wrap" />
-
-            <Image Source="{Binding PreviewImage}" />
-
-
-          </StackPanel>
-        </m:Card>
-        <!--  ADVANCED SETTINGS  -->
-        <Button
-          Grid.Row="3"
-          Grid.ColumnSpan="4"
-          Margin="5"
-          HorizontalAlignment="Center"
-          HorizontalContentAlignment="Center"
-          assists:ShadowAssist.ShadowDepth="Depth0"
-          Background="Transparent"
-          Command="{Binding OpenSettingsCommand}"
-          Foreground="{DynamicResource PrimaryHueMidBrush}">
-          <Grid Margin="0" ColumnDefinitions="auto,*">
-            <icons:MaterialIcon VerticalAlignment="Center" Kind="Settings" />
-            <TextBlock
-              Grid.Column="1"
-              Margin="8,0"
-              Padding="0"
-              VerticalAlignment="Center"
-              Text="Advanced Settings"
-              TextTrimming="CharacterEllipsis" />
-          </Grid>
-        </Button>
-      </Grid>
-    </Expander>
-
-    <Grid
-      Grid.Row="1"
-      Margin="15,5"
-      ColumnDefinitions="*,auto">
-
-      <StackPanel
-        Grid.Column="1"
-        HorizontalAlignment="Right"
-        Orientation="Horizontal"
-        Spacing="10">
-        <!--  SAVE BTN  -->
-        <m:FloatingButton
-          VerticalAlignment="Center"
-          assists:ShadowAssist.ShadowDepth="Depth0"
-          Background="Transparent"
-          Command="{Binding SaveCommand}"
-          IsEnabled="{Binding !Progress.IsProgressing}"
-          ToolTip.Tip="Save this sender to the file without sending">
-          <Button.Content>
-            <icons:MaterialIcon
-              Width="20"
-              Height="20"
-              assists:ShadowAssist.ShadowDepth="0"
-              Foreground="Gray"
-              Kind="ContentSave" />
-
-          </Button.Content>
-        </m:FloatingButton>
-
-        <!--  PREVIEW BTN  -->
-        <c:PreviewButton />
-
-        <!--  RECEIVE BTN  -->
-        <c:ReceiveButton />
-
-      </StackPanel>
-    </Grid>
-
-  </Grid>
-</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Receive.xaml.cs b/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Receive.xaml.cs
deleted file mode 100644
index 8d4115c6ae..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Receive.xaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace DesktopUI2.Views.Pages.StreamEditControls
-{
-  public partial class Receive : UserControl
-  {
-    public Receive()
-    {
-      InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-      AvaloniaXamlLoader.Load(this);
-    }
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Send.xaml b/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Send.xaml
deleted file mode 100644
index 47985f21dc..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditControls/Send.xaml
+++ /dev/null
@@ -1,194 +0,0 @@
-<UserControl
-  x:Class="DesktopUI2.Views.Pages.StreamEditControls.Send"
-  xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-  xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  xmlns:viewModels="clr-namespace:DesktopUI2.ViewModels"
-  d:DesignHeight="450"
-  d:DesignWidth="400"
-  mc:Ignorable="d">
-
-  <Grid RowDefinitions="auto, auto">
-
-    <Expander
-      Padding="15,0"
-      HorizontalAlignment="Stretch"
-      HorizontalContentAlignment="Stretch"
-      Background="Transparent"
-      Classes="Flat"
-      IsExpanded="{Binding IsExpanded}">
-      <Expander.Header>
-        <StackPanel Orientation="Horizontal">
-          <TextBlock Text="Sending " />
-          <TextBlock FontWeight="Bold" Text="{Binding SelectedFilter.Summary, FallbackValue=?}" />
-          <TextBlock Text=" to " />
-          <TextBlock FontWeight="Bold" Text="{Binding SelectedBranch.Branch.name, FallbackValue=?}" />
-          <TextBlock
-            Classes="Overline"
-            Foreground="Gray"
-            Text="  (expand to edit)" />
-        </StackPanel>
-      </Expander.Header>
-
-      <Grid
-        Margin="15,0"
-        ColumnDefinitions="auto,*,auto, *"
-        RowDefinitions="auto, auto, auto">
-
-        <!--  SELECT BRANCH  -->
-        <icons:MaterialIcon
-          Margin="0"
-          VerticalAlignment="Center"
-          Foreground="Gray"
-          Kind="InfoCircle"
-          ToolTip.Tip="Data in a stream can be organized in branches,&#x0a;for instance, to have multiple design options&#x0a;or to store data by discipline.&#x0a;The default branch is called main." />
-        <ComboBox
-          Grid.Column="1"
-          Margin="5,10,5,10"
-          HorizontalAlignment="Stretch"
-          VerticalAlignment="Center"
-          Items="{Binding BranchesViewModel}"
-          PlaceholderText="Select a branch"
-          SelectedItem="{Binding SelectedBranch, Mode=TwoWay}">
-          <ComboBox.ItemsPanel />
-          <ComboBox.ItemTemplate>
-            <DataTemplate>
-              <Grid ColumnDefinitions="auto,*">
-                <icons:MaterialIcon
-                  Margin="0,0,5,0"
-                  Foreground="DarkGray"
-                  Kind="{Binding Icon}" />
-                <TextBlock
-                  Grid.Column="1"
-                  Text="{Binding Branch.name}"
-                  TextTrimming="CharacterEllipsis" />
-              </Grid>
-            </DataTemplate>
-          </ComboBox.ItemTemplate>
-        </ComboBox>
-
-        <!--  SELECT FILTER  -->
-        <icons:MaterialIcon
-          Grid.Column="2"
-          Margin="0"
-          VerticalAlignment="Center"
-          Foreground="Gray"
-          Kind="InfoCircle"
-          ToolTip.Tip="Each connector offers various&#x0a;ways to send data.&#x0a;Select the filter you want to use." />
-        <ComboBox
-          Name="FilterCombo"
-          Grid.Column="3"
-          Margin="5,10,0,10"
-          HorizontalAlignment="Stretch"
-          VerticalAlignment="Center"
-          Items="{Binding AvailableFilters}"
-          PlaceholderText="Select a filter"
-          SelectedIndex="0"
-          SelectedItem="{Binding SelectedFilter}">
-          <ComboBox.ItemTemplate>
-            <DataTemplate>
-              <Grid ColumnDefinitions="auto,*">
-                <icons:MaterialIcon
-                  Margin="0,0,5,0"
-                  Foreground="DarkGray"
-                  Kind="{Binding Filter.Icon}" />
-                <TextBlock
-                  Grid.Column="1"
-                  Text="{Binding Filter.Name}"
-                  TextTrimming="CharacterEllipsis" />
-              </Grid>
-            </DataTemplate>
-          </ComboBox.ItemTemplate>
-        </ComboBox>
-        <!--  FILTER INFO - the magic happens in FilterTemplateSelector.cs  -->
-        <Grid
-          Grid.Row="1"
-          Grid.ColumnSpan="4"
-          Margin="0,15">
-          <ContentControl Content="{Binding SelectedFilter}" />
-        </Grid>
-        <!--  ADVANCED SETTINGS  -->
-        <Button
-          Grid.Row="2"
-          Grid.ColumnSpan="4"
-          Margin="5"
-          HorizontalAlignment="Center"
-          HorizontalContentAlignment="Center"
-          assists:ShadowAssist.ShadowDepth="Depth0"
-          Background="Transparent"
-          Command="{Binding OpenSettingsCommand}"
-          Foreground="{DynamicResource PrimaryHueMidBrush}">
-          <Grid Margin="0" ColumnDefinitions="auto,*">
-            <icons:MaterialIcon VerticalAlignment="Center" Kind="Settings" />
-            <TextBlock
-              Grid.Column="1"
-              Margin="8,0"
-              Padding="0"
-              VerticalAlignment="Center"
-              Text="Advanced Settings"
-              TextTrimming="CharacterEllipsis" />
-          </Grid>
-        </Button>
-
-      </Grid>
-
-    </Expander>
-
-
-    <Grid
-      Grid.Row="1"
-      Margin="15,5"
-      ColumnDefinitions="*,auto">
-      <!--  COMMIT MESSAGE  -->
-      <TextBox
-        Margin="0,0,10,0"
-        Padding="0"
-        HorizontalAlignment="Stretch"
-        HorizontalContentAlignment="Stretch"
-        Classes="Filled Dense"
-        Foreground="Gray"
-        IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}}"
-        IsReadOnly="{Binding Progress.IsProgressing}"
-        Text="{Binding StreamState.CommitMessage}"
-        Watermark="Message (optional) " />
-      <StackPanel
-        Grid.Column="1"
-        HorizontalAlignment="Right"
-        Orientation="Horizontal"
-        Spacing="10">
-
-        <!--  SAVE BTN  -->
-        <m:FloatingButton
-          VerticalAlignment="Center"
-          assists:ShadowAssist.ShadowDepth="Depth0"
-          Background="Transparent"
-          Command="{Binding SaveCommand}"
-          IsEnabled="{Binding !Progress.IsProgressing}"
-          ToolTip.Tip="Save this sender to the file without sending">
-          <Button.Content>
-            <icons:MaterialIcon
-              Width="20"
-              Height="20"
-              assists:ShadowAssist.ShadowDepth="0"
-              Foreground="Gray"
-              Kind="ContentSave" />
-
-          </Button.Content>
-        </m:FloatingButton>
-
-        <!--  PREVIEW BTN  -->
-        <c:PreviewButton />
-
-        <!--  SEND BTN  -->
-        <c:SendButton />
-      </StackPanel>
-    </Grid>
-
-  </Grid>
-
-</UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml
index 938c417322..2746c3f1f8 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml
@@ -3,14 +3,14 @@
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+  xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
   xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:dataTemplates="using:DesktopUI2.Views.DataTemplates"
   xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  xmlns:sc="clr-namespace:DesktopUI2.Views.Pages.SharedControls"
-  xmlns:uc="clr-namespace:DesktopUI2.Views.Pages.StreamEditControls"
+  xmlns:uc="clr-namespace:DesktopUI2.Views.Controls.StreamEditControls"
   xmlns:viewModels="clr-namespace:DesktopUI2.ViewModels.DesignViewModels"
   d:DesignHeight="550"
   d:DesignWidth="400"
@@ -20,9 +20,9 @@
     <dataTemplates:FilterTemplateSelector />
   </UserControl.DataTemplates>
 
-  <Design.DataContext>
+  <!--<Design.DataContext>
     <viewModels:DesignSavedStreamViewModel />
-  </Design.DataContext>
+  </Design.DataContext>-->
 
   <UserControl.Resources>
     <conv:RoleCanSendValueConverter x:Key="RoleCanSendValueConverter" />
@@ -30,7 +30,7 @@
     <conv:StringOpacityValueConverter x:Key="StringOpacityValueConverter" />
     <conv:StreamEditHeightConverter x:Key="StreamEditHeightConverter" />
   </UserControl.Resources>
-  <Grid RowDefinitions="auto,*, 3, auto">
+  <Grid RowDefinitions="auto,*, auto, auto">
     <Border
       x:Name="header"
       Margin="0,0,0,7"
@@ -69,8 +69,8 @@
             Foreground="White"
             Text="{Binding Stream.name}"
             TextTrimming="CharacterEllipsis" />
-          <sc:StreamDetails Grid.Row="1">
-            <sc:StreamDetails.Styles>
+          <c:StreamDetails Grid.Row="1">
+            <c:StreamDetails.Styles>
               <Style Selector="TextBlock">
                 <Setter Property="Foreground" Value="White" />
               </Style>
@@ -78,27 +78,10 @@
                 <Setter Property="Foreground" Value="White" />
               </Style>
 
-            </sc:StreamDetails.Styles>
-          </sc:StreamDetails>
+            </c:StreamDetails.Styles>
+          </c:StreamDetails>
         </Grid>
-        <!--  SHARE STREAM  -->
-        <m:FloatingButton
-          Grid.Column="2"
-          VerticalAlignment="Center"
-          assists:ShadowAssist.ShadowDepth="Depth0"
-          Background="Transparent"
-          Classes="Mini"
-          Command="{Binding ShareCommand}"
-          ToolTip.Tip="Share">
-          <Button.Content>
-            <icons:MaterialIcon
-              Width="15"
-              Height="15"
-              assists:ShadowAssist.ShadowDepth="0"
-              Foreground="White"
-              Kind="UsersAdd" />
-          </Button.Content>
-        </m:FloatingButton>
+        <!--  THREE DOTS  -->
         <Menu Grid.Column="3" Items="{Binding MenuItems}">
           <Menu.Styles>
             <Style Selector="MenuItem">
@@ -114,80 +97,185 @@
       </Grid>
     </Border>
 
-    <Grid
+    <!--  Background="{DynamicResource MaterialDesignCardBackground}"  -->
+    <TabControl
       Grid.Row="1"
-      Margin="15,0"
-      RowDefinitions="*,auto,auto">
-      <!--  ACTIVITY & COMMENTS & REPORT  -->
+      Background="Transparent"
+      SelectedIndex="{Binding SelectedTab}">
+      <TabItem ToolTip.Tip="Data Exchange">
+        <TabItem.Header>
+          <StackPanel Orientation="Horizontal">
+            <icons:MaterialIcon
+              Width="20"
+              Height="20"
+              VerticalAlignment="Center"
+              Kind="Exchange"
+              ToolTip.Tip="Exchange Data">
+              <icons:MaterialIcon.RenderTransform>
+                <RotateTransform Angle="-45" />
+              </icons:MaterialIcon.RenderTransform>
+            </icons:MaterialIcon>
+          </StackPanel>
+        </TabItem.Header>
+        <Grid RowDefinitions="auto,*">
+          <TextBlock
+            Margin="20,20,20,0"
+            Classes="SpeckleFont"
+            FontSize="18"
+            Text="Data Exchange" />
+          <TabControl
+            Grid.Row="1"
+            Background="Transparent"
+            SelectedIndex="{Binding IsReceiver}">
+            <!--  SEND  -->
+            <TabItem IsEnabled="{Binding Stream.role, Converter={StaticResource RoleCanSendValueConverter}}" ToolTip.Tip="Send">
+              <TabItem.Header>
+                <StackPanel Orientation="Horizontal">
+                  <icons:MaterialIcon
+                    Width="20"
+                    Height="20"
+                    VerticalAlignment="Center"
+                    Kind="CubeSend">
+                    <icons:MaterialIcon.RenderTransform>
+                      <RotateTransform Angle="-30" />
+                    </icons:MaterialIcon.RenderTransform>
+                  </icons:MaterialIcon>
+                  <TextBlock
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="Send" />
+                </StackPanel>
+              </TabItem.Header>
+              <ScrollViewer>
+                <uc:Send />
+              </ScrollViewer>
 
-      <TabControl
-        Name="tabStreamEdit"
-        Grid.Row="0"
-        Background="Transparent">
-        <TabItem>
-          <TabItem.Header>
-            <StackPanel Orientation="Horizontal">
-              <icons:MaterialIcon
-                Width="20"
-                Height="20"
-                VerticalAlignment="Center"
-                Kind="TimelineText"
-                ToolTip.Tip="Send and Receive activity" />
-              <TextBlock
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                Text="Activity" />
-            </StackPanel>
-          </TabItem.Header>
-          <!--  ACTIVITY  -->
-          <!--
-            NOTE FORMATTED TEXT IS COMING TO AVALONIA !
-            https://github.com/AvaloniaUI/Avalonia/pull/6953
-          -->
-          <uc:Activity />
-        </TabItem>
+            </TabItem>
 
-        <TabItem>
-          <TabItem.Header>
-            <StackPanel Orientation="Horizontal">
-              <icons:MaterialIcon
-                Width="20"
-                Height="20"
-                VerticalAlignment="Center"
-                Kind="Comments"
-                ToolTip.Tip="Comments" />
-              <TextBlock
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                Text="Comments" />
-            </StackPanel>
-          </TabItem.Header>
-          <uc:Comments />
-        </TabItem>
+            <!--  RECEIVE  -->
+            <TabItem ToolTip.Tip="Receive">
+              <TabItem.Header>
+                <StackPanel Orientation="Horizontal">
+                  <icons:MaterialIcon
+                    Width="20"
+                    Height="20"
+                    Kind="CubeSend">
+                    <icons:MaterialIcon.RenderTransform>
+                      <TransformGroup>
+                        <RotateTransform Angle="30" />
+                        <ScaleTransform ScaleX="-1" />
+                      </TransformGroup>
+                    </icons:MaterialIcon.RenderTransform>
+                  </icons:MaterialIcon>
+                  <TextBlock
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="Receive" />
+                </StackPanel>
+              </TabItem.Header>
+              <ScrollViewer>
+                <uc:Receive />
+              </ScrollViewer>
+            </TabItem>
+          </TabControl>
+        </Grid>
 
-        <!--  REPORT  -->
-        <TabItem>
-          <TabItem.Header>
-            <StackPanel Orientation="Horizontal">
-              <icons:MaterialIcon
-                Width="20"
-                Height="20"
-                VerticalAlignment="Center"
-                Kind="Information"
-                ToolTip.Tip="Send and Receive report" />
-              <TextBlock
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                Text="Report" />
-            </StackPanel>
-          </TabItem.Header>
+      </TabItem>
+
+      <!--  COLLABORATORS  -->
+      <TabItem ToolTip.Tip="Manage Collaborators">
+        <TabItem.Header>
+          <StackPanel Orientation="Horizontal">
+            <icons:MaterialIcon
+              Width="20"
+              Height="20"
+              Kind="AccountGroup" />
+          </StackPanel>
+        </TabItem.Header>
+        <Grid RowDefinitions="auto,*">
+          <TextBlock
+            Margin="20"
+            Classes="SpeckleFont"
+            FontSize="18"
+            Text="Collaborators" />
+          <c:CollaboratorsControl
+            Grid.Row="1"
+            Margin="10,0,10,10"
+            Padding="5"
+            DataContext="{Binding Collaborators}" />
+        </Grid>
+
+      </TabItem>
+
+      <TabItem ToolTip.Tip="Recent Activity">
+        <TabItem.Header>
+          <StackPanel Orientation="Horizontal">
+            <icons:MaterialIcon
+              Width="20"
+              Height="20"
+              VerticalAlignment="Center"
+              Kind="TimelineText" />
+          </StackPanel>
+        </TabItem.Header>
+        <!--  ACTIVITY  -->
+        <Grid RowDefinitions="auto,*">
+          <TextBlock
+            Margin="20,20,20,20"
+            Classes="SpeckleFont"
+            FontSize="18"
+            Text="Activity" />
+          <uc:Activity Grid.Row="1" />
+        </Grid>
+      </TabItem>
+      <!--  COMMENTS  -->
+      <TabItem ToolTip.Tip="Comments">
+        <TabItem.Header>
+          <StackPanel Orientation="Horizontal">
+            <icons:MaterialIcon
+              Width="20"
+              Height="20"
+              VerticalAlignment="Center"
+              Kind="Comments" />
+          </StackPanel>
+        </TabItem.Header>
+        <Grid RowDefinitions="auto,*">
+          <TextBlock
+            Margin="20,20,20,20"
+            Classes="SpeckleFont"
+            FontSize="18"
+            Text="Comments" />
+          <uc:Comments Grid.Row="1" Margin="15,0" />
+        </Grid>
 
-          <Grid ColumnDefinitions="*,auto" RowDefinitions="auto,auto,auto,*">
+      </TabItem>
+
+      <!--  REPORT  -->
+      <TabItem ToolTip.Tip="Report">
+        <TabItem.Header>
+          <StackPanel Orientation="Horizontal">
+            <icons:MaterialIcon
+              Width="20"
+              Height="20"
+              VerticalAlignment="Center"
+              Kind="Information" />
+          </StackPanel>
+        </TabItem.Header>
+
+        <Grid RowDefinitions="auto,*">
+          <TextBlock
+            Margin="20,20,20,20"
+            Classes="SpeckleFont"
+            FontSize="18"
+            Text="Report" />
+          <Grid
+            Grid.Row="1"
+            ColumnDefinitions="*,auto"
+            RowDefinitions="auto,auto,auto,*">
 
             <!--  SUMMARY AND OPERATION ERRORS  -->
             <TextBlock
               Grid.Row="0"
-              Margin="10,0,0,0"
+              Margin="20,0"
               VerticalAlignment="Center"
               Text="{Binding Log}"
               TextWrapping="Wrap" />
@@ -271,151 +359,12 @@
               IsVisible="{Binding HasReportItems}" />
           </Grid>
 
-        </TabItem>
-
-      </TabControl>
-
-      <!--  NOTIFICATION  -->
-      <m:ColorZone
-        Grid.Row="1"
-        Margin="0,0,0,10"
-        assists:ShadowAssist.ShadowDepth="Depth0"
-        CornerRadius="25"
-        IsVisible="{Binding ShowNotification}"
-        Mode="PrimaryMid">
-        <Grid ColumnDefinitions="*, auto">
-          <Button
-            Margin="0,0,3,0"
-            VerticalAlignment="Center"
-            Classes="Flat"
-            Command="{Binding LaunchNotificationCommand}"
-            CornerRadius="25,0,0,25"
-            ToolTip.Tip="View online">
-            <StackPanel Orientation="Horizontal">
-              <TextBlock
-                VerticalAlignment="Center"
-                Classes="Overline"
-                FontWeight="Medium"
-                Foreground="White"
-                Text="{Binding Notification}"
-                TextWrapping="Wrap" />
-              <icons:MaterialIcon
-                Margin="5,0"
-                VerticalAlignment="Center"
-                Foreground="White"
-                Kind="ExternalLink" />
-            </StackPanel>
-          </Button>
-          <m:FloatingButton
-            Grid.Column="1"
-            VerticalAlignment="Center"
-            Background="Transparent"
-            Classes="Mini"
-            Command="{Binding CloseNotificationCommand}"
-            ToolTip.Tip="Close notification">
-            <Button.Content>
-              <icons:MaterialIcon
-                Width="15"
-                Height="15"
-                Foreground="White"
-                Kind="Close" />
-            </Button.Content>
-          </m:FloatingButton>
-        </Grid>
-      </m:ColorZone>
-
-      <!--  SHARE PROMPT  -->
-      <m:ColorZone
-        Grid.Row="2"
-        Margin="0,0,0,10"
-        assists:ShadowAssist.ShadowDepth="Depth0"
-        CornerRadius="25"
-        IsVisible="{Binding ShowSharePrompt}"
-        Mode="PrimaryLight">
-        <Grid ColumnDefinitions="*, auto">
-          <Button
-            Margin="0,0,3,0"
-            VerticalAlignment="Center"
-            Classes="Flat"
-            Command="{Binding ShareCommand}"
-            CornerRadius="25,0,0,25"
-            ToolTip.Tip="Share stream">
-            <StackPanel Orientation="Horizontal">
-              <TextBlock
-                VerticalAlignment="Center"
-                Classes="Overline"
-                FontWeight="Medium"
-                Foreground="White"
-                Text="Enable multiplayer mode!"
-                TextWrapping="Wrap" />
-              <icons:MaterialIcon
-                Margin="5,0"
-                VerticalAlignment="Center"
-                Foreground="White"
-                Kind="UsersAdd" />
-            </StackPanel>
-          </Button>
         </Grid>
-      </m:ColorZone>
-
-    </Grid>
 
-    <!--<GridSplitter Grid.Row="2" ResizeDirection="Rows" />-->
 
-    <!--  SEND/RECEIVE  -->
-    <ScrollViewer
-      x:Name="Scroller"
-      Grid.Row="3"
-      MaxHeight="{Binding $parent[Grid].Bounds.Height, Converter={StaticResource StreamEditHeightConverter}}">
-      <TabControl Background="{DynamicResource MaterialDesignCardBackground}" SelectedIndex="{Binding IsReceiver}">
+      </TabItem>
 
-        <TabItem IsEnabled="{Binding Stream.role, Converter={StaticResource RoleCanSendValueConverter}}">
-          <TabItem.Header>
-            <StackPanel Orientation="Horizontal">
-              <icons:MaterialIcon
-                Width="20"
-                Height="20"
-                VerticalAlignment="Center"
-                Kind="CubeSend"
-                ToolTip.Tip="Send">
-                <icons:MaterialIcon.RenderTransform>
-                  <RotateTransform Angle="-30" />
-                </icons:MaterialIcon.RenderTransform>
-              </icons:MaterialIcon>
-              <TextBlock
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                Text="Send" />
-            </StackPanel>
-          </TabItem.Header>
-          <uc:Send />
-        </TabItem>
-
-        <TabItem>
-          <TabItem.Header>
-            <StackPanel Orientation="Horizontal">
-              <icons:MaterialIcon
-                Width="20"
-                Height="20"
-                Kind="CubeSend"
-                ToolTip.Tip="Receive">
-                <icons:MaterialIcon.RenderTransform>
-                  <TransformGroup>
-                    <RotateTransform Angle="30" />
-                    <ScaleTransform ScaleX="-1" />
-                  </TransformGroup>
-                </icons:MaterialIcon.RenderTransform>
-              </icons:MaterialIcon>
-              <TextBlock
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                Text="Receive" />
-            </StackPanel>
-          </TabItem.Header>
-          <uc:Receive />
-        </TabItem>
-      </TabControl>
-    </ScrollViewer>
+    </TabControl>
   </Grid>
 
 </UserControl>
diff --git a/DesktopUI2/DesktopUI2/Views/Share.xaml b/DesktopUI2/DesktopUI2/Views/Share.xaml
deleted file mode 100644
index 5f9af7b8da..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Share.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Window
-  x:Class="DesktopUI2.Views.Share"
-  xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-  xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  xmlns:p="clr-namespace:DesktopUI2.Views.Pages"
-  xmlns:reactiveUi="http://reactiveui.net"
-  xmlns:vm="using:DesktopUI2.ViewModels.DesignViewModels"
-  Title="{Binding TitleFull}"
-  Width="500"
-  Icon="/Assets/icon.ico"
-  SizeToContent="Height"
-  mc:Ignorable="d">
-  <Design.DataContext>
-    <vm:DesignShareViewModel />
-  </Design.DataContext>
-
-
-  <reactiveUi:RoutedViewHost Grid.Row="1" Router="{Binding Router}">
-    <reactiveUi:RoutedViewHost.PageTransition>
-      <CrossFade Duration="0.15" />
-    </reactiveUi:RoutedViewHost.PageTransition>
-  </reactiveUi:RoutedViewHost>
-
-</Window>
diff --git a/DesktopUI2/DesktopUI2/Views/Share.xaml.cs b/DesktopUI2/DesktopUI2/Views/Share.xaml.cs
deleted file mode 100644
index 9de51ade4f..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Share.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Avalonia;
-using Avalonia.Input;
-using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
-using DesktopUI2.ViewModels.Share;
-
-namespace DesktopUI2.Views
-{
-  public partial class Share : ReactiveWindow<ShareViewModel>
-  {
-
-    public Share()
-    {
-      InitializeComponent();
-#if DEBUG
-      this.AttachDevTools(KeyGesture.Parse("CTRL+R"));
-#endif
-
-
-    }
-
-    private void InitializeComponent()
-    {
-      AvaloniaXamlLoader.Load(this);
-    }
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/AddAccountDialog.xaml b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/AddAccountDialog.xaml
index 82a59e9657..9102efffb7 100644
--- a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/AddAccountDialog.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/AddAccountDialog.xaml
@@ -5,7 +5,7 @@
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  d:DesignHeight="200"
+  d:DesignHeight="300"
   d:DesignWidth="400"
   mc:Ignorable="d">
   <Grid RowDefinitions="auto, auto, auto, auto, auto, auto">
@@ -19,14 +19,21 @@
       Grid.Row="1"
       Margin="15"
       Foreground="Gray"
-      Text="Log In to Speckle by providing your Server URL"
+      Text="A new window will open in your browser, you can return here after logging in 🙌"
       TextWrapping="Wrap" />
-
-    <TextBox
-      Name="url"
+    <Expander
       Grid.Row="2"
-      Margin="15,0"
-      Watermark="Server URL" />
+      Classes="Minimal Flat Transparent"
+      Header="Want to set a custom Server URL?">
+      <StackPanel Orientation="Vertical">
+        <TextBox
+          Name="url"
+          Margin="15,0"
+          Watermark="Server URL" />
+      </StackPanel>
+
+    </Expander>
+
 
     <StackPanel
       Grid.Row="5"
@@ -41,7 +48,8 @@
       <Button
         Margin="0,0,10,0"
         Click="Add_Click"
-        Content="Add"
+        Content="Go"
+        IsDefault="True"
         IsEnabled="{Binding #url.Text, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
 
     </StackPanel>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/ChangeRoleDialog.xaml b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ChangeRoleDialog.xaml
similarity index 94%
rename from DesktopUI2/DesktopUI2/Views/Pages/ShareControls/ChangeRoleDialog.xaml
rename to DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ChangeRoleDialog.xaml
index bb0a9b47ec..56242d58a1 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/ChangeRoleDialog.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ChangeRoleDialog.xaml
@@ -1,5 +1,5 @@
 <UserControl
-  x:Class="DesktopUI2.Views.Pages.ShareControls.ChangeRoleDialog"
+  x:Class="DesktopUI2.Views.Windows.Dialogs.ChangeRoleDialog"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -45,7 +45,7 @@
       <Button
         Margin="0,0,10,0"
         Click="Save_Click"
-        Content="Save"
+        Content="OK"
         IsEnabled="{Binding #role.SelectedItem, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
 
     </StackPanel>
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/ChangeRoleDialog.xaml.cs b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ChangeRoleDialog.xaml.cs
similarity index 84%
rename from DesktopUI2/DesktopUI2/Views/Pages/ShareControls/ChangeRoleDialog.xaml.cs
rename to DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ChangeRoleDialog.xaml.cs
index 17f61bf99d..83206168a8 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/ShareControls/ChangeRoleDialog.xaml.cs
+++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ChangeRoleDialog.xaml.cs
@@ -1,9 +1,8 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
-using DesktopUI2.Views.Windows.Dialogs;
 
-namespace DesktopUI2.Views.Pages.ShareControls
+namespace DesktopUI2.Views.Windows.Dialogs
 {
   public partial class ChangeRoleDialog : DialogUserControl
   {
@@ -30,12 +29,12 @@ public void Save_Click(object sender, RoutedEventArgs e)
     {
       //too lazy to create a view model for this or properly style the Dialogs
       Role = (RoleField.SelectedItem as ComboBoxItem).Content as string;
-      this.Close(Role);
+      Close(Role);
     }
 
     public void Close_Click(object sender, RoutedEventArgs e)
     {
-      this.Close(null);
+      Close(null);
     }
   }
 }
diff --git a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ImportFamiliesDialog.xaml b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ImportFamiliesDialog.xaml
index 2d804487cc..229c36bbf6 100644
--- a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ImportFamiliesDialog.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/ImportFamiliesDialog.xaml
@@ -3,13 +3,10 @@
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-  xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:dvm="clr-namespace:DesktopUI2.ViewModels.DesignViewModels"
   xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  xmlns:uc="clr-namespace:DesktopUI2.Views.Pages.StreamEditControls"
   xmlns:vm="clr-namespace:DesktopUI2.ViewModels"
   d:DesignHeight="550"
   d:DesignWidth="400"
@@ -87,7 +84,7 @@
         CornerRadius="5">
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
           <StackPanel>
-            <ListBox Items="{Binding LoadedFamilies}" SelectedItem="{Binding SelectedFamily}, Mode=TwoWay" />
+            <ListBox Items="{Binding LoadedFamilies}" SelectedItem="{Binding SelectedFamily, Mode=TwoWay}" />
           </StackPanel>
         </ScrollViewer>
       </Border>
@@ -166,7 +163,7 @@
                       <Grid ColumnDefinitions="auto,*">
                         <CheckBox
                           Margin="3,0,0,0"
-                          IsChecked="{Binding isChecked}, Mode=TwoWay"
+                          IsChecked="{Binding isChecked, Mode=TwoWay}"
                           IsVisible="{Binding !isImported}" />
                         <icons:MaterialIcon
                           Grid.Row="0"
@@ -232,7 +229,7 @@
                   <Grid ColumnDefinitions="auto,*">
                     <CheckBox
                       Margin="10,0,0,0"
-                      IsChecked="{Binding isChecked}, Mode=TwoWay"
+                      IsChecked="{Binding isChecked, Mode=TwoWay}"
                       IsVisible="{Binding !isImported}" />
                     <icons:MaterialIcon
                       Grid.Row="0"
diff --git a/DesktopUI2/README.md b/DesktopUI2/README.md
index 2f99229472..eb9a2fe6dc 100644
--- a/DesktopUI2/README.md
+++ b/DesktopUI2/README.md
@@ -1,11 +1,13 @@
 # DesktopUI v2
 
-Cross-platform User Interface for all our .NET based connectors.
-It uses [Avalonia](https://github.com/AvaloniaUI/Avalonia) and [Material.Avalonia](https://github.com/AvaloniaCommunity/Material.Avalonia).
+Experiments for a cross-platform DesktopUI using Avalonia.
 
-For local debugging, set the start project to `DesktopUI2.Launcher` and hit debug.
-For full expereince get a free Speckle account at: https://speckle.xyz/
 
-NOTE: launching the UI outside a host applicaiton uses dummy bindings so no data is actually sent or received.
 
+## Building & Debugging
+
+Rebuild solution & hit debug, that should be enough! Currently being tested with:
+
+- Rhino 7 Win and Mac
+- Revit 2022
 
diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertArea.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertArea.cs
index 35dcfa4271..ac0342808d 100644
--- a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertArea.cs	
+++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertArea.cs	
@@ -61,9 +61,9 @@ public object AreaToNative(Element2D area)
         {
           Model.AreaObj.AddByCoord(numPoints, ref x, ref y, ref z, ref name, area.property.name);
         }
-        else
+        else if (area.property is CSIProperty2D prop2D)
         {
-          Property2DToNative((CSIProperty2D)area.property);
+          Property2DToNative(prop2D);
           Model.AreaObj.AddByCoord(numPoints, ref x, ref y, ref z, ref name, area.property.name);
         }
       }
diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs
index 424bb22bee..8f00fc426e 100644
--- a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs	
+++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs	
@@ -294,7 +294,12 @@ public void setFrameElementProperties(Element1D element1D, string newFrame)
         if (CSIelement1D.SpandrelAssignment != null) { Model.FrameObj.SetSpandrel(CSIelement1D.name, CSIelement1D.SpandrelAssignment); }
         if (CSIelement1D.PierAssignment != null) { Model.FrameObj.SetPier(CSIelement1D.name, CSIelement1D.PierAssignment); }
         if (CSIelement1D.CSILinearSpring != null) { Model.FrameObj.SetSpringAssignment(CSIelement1D.name, CSIelement1D.CSILinearSpring.name); }
-        if (CSIelement1D.DesignProcedure != null)
+        if (CSIelement1D.Modifiers != null)
+        {
+          var modifiers = CSIelement1D.Modifiers;
+          Model.FrameObj.SetModifiers(CSIelement1D.name, ref modifiers);
+        }
+        if (CSIelement1D.property.material.name != null)
         {
           switch (CSIelement1D.DesignProcedure)
           {
@@ -320,11 +325,10 @@ public void setFrameElementProperties(Element1D element1D, string newFrame)
               Model.FrameObj.SetDesignProcedure(CSIelement1D.name, 7);
               break;
           }
-          if (CSIelement1D.Modifiers != null)
-          {
-            var modifiers = CSIelement1D.Modifiers;
-            Model.FrameObj.SetModifiers(CSIelement1D.name, ref modifiers);
-          }
+        }
+        else
+        {
+          Model.FrameObj.SetDesignProcedure(CSIelement1D.name, 0);
         }
       }
 
diff --git a/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.Geometry.cs b/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.Geometry.cs
index 20ad1c0f96..968a1ea5fd 100644
--- a/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.Geometry.cs
+++ b/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.Geometry.cs
@@ -325,6 +325,7 @@ public Arc ArcToSpeckle(DS.Arc a, string units = null)
       var u = units ?? ModelUnits;
       using (DS.Vector xAxis = DS.Vector.ByTwoPoints(a.CenterPoint, a.StartPoint))
       using (DS.Plane basePlane = DS.Plane.ByOriginNormalXAxis(a.CenterPoint, a.Normal, xAxis))
+      using (DS.Point midPoint = a.PointAtParameter(0.5))
       {
         var arc = new Arc(
           PlaneToSpeckle(basePlane, u),
@@ -334,11 +335,15 @@ public Arc ArcToSpeckle(DS.Arc a, string units = null)
           a.SweepAngle.ToRadians(),
           u
         );
-
+        arc.startPoint = PointToSpeckle(a.StartPoint);
+        arc.midPoint = PointToSpeckle(midPoint);
+        arc.endPoint = PointToSpeckle(a.EndPoint);
+        
         CopyProperties(arc, a);
+        
         arc.length = a.Length;
-
         arc.bbox = BoxToSpeckle(a.BoundingBox);
+        
         return arc;
       }
     }
@@ -711,8 +716,8 @@ public Mesh MeshToSpeckle(DS.Mesh mesh, string units = null)
           }
         })
         .ToList();
-
-      var colors = Enumerable.Repeat(defaultColour.ToArgb(), vertices.Count()).ToList();
+      
+      //var colors = Enumerable.Repeat(defaultColour.ToArgb(), mesh.VertexPositions.Length).ToList();
       //double[] textureCoords;
 
       //if (SpeckleRhinoConverter.AddMeshTextureCoordinates)
@@ -721,7 +726,7 @@ public Mesh MeshToSpeckle(DS.Mesh mesh, string units = null)
       //  return new SpeckleMesh(vertices, faces, Colors, textureCoords, properties: mesh.UserDictionary.ToSpeckle());
       //}
 
-      var speckleMesh = new Mesh(vertices, faces, colors, units: u);
+      var speckleMesh = new Mesh(vertices, faces, units: u);
 
       CopyProperties(speckleMesh, mesh);
 
diff --git a/Objects/Converters/ConverterRevit/ConverterRevit2019/ConverterRevit2019.csproj b/Objects/Converters/ConverterRevit/ConverterRevit2019/ConverterRevit2019.csproj
deleted file mode 100644
index 0cb0218a56..0000000000
--- a/Objects/Converters/ConverterRevit/ConverterRevit2019/ConverterRevit2019.csproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>8.0</LangVersion>
-    <RootNamespace>Objects.Converter.Revit</RootNamespace>
-    <AssemblyName>Objects.Converter.Revit2019</AssemblyName>
-    <Configurations>Debug;Release</Configurations>
-    <DefineConstants>$(DefineConstants);REVIT2019</DefineConstants>
-    <PackageId>Speckle.Objects.Converter.Revit2019</PackageId>
-    <Authors>Speckle</Authors>
-    <Company>Speckle</Company>
-    <Product>Objects.Converter.Revit2019</Product>
-    <Version>2.1.0</Version>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <Description>Converter for Revit 2019</Description>
-    <PackageTags>speckle objects converter revit</PackageTags>
-    <RepositoryUrl>https://github.com/specklesystems/speckle-sharp</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageIcon>logo.png</PackageIcon>
-    <PackageProjectUrl>https://speckle.systems/</PackageProjectUrl>
-    <Copyright>Copyright (c) AEC Systems Ltd</Copyright>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="ModPlus.Revit.API.2019">
-      <Version>1.0.0</Version>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Core\Core.csproj" />
-    <ProjectReference Include="..\..\..\Objects\Objects.csproj" />
-    <ProjectReference Include="..\..\ConverterDxf\ConverterDxf\ConverterDxf.csproj" />
-  </ItemGroup>
-
-
-  <PropertyGroup>
-    <IsDesktopBuild Condition="'$(IsDesktopBuild)' == ''">true</IsDesktopBuild>
-  </PropertyGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(IsDesktopBuild)' == true">
-    <Exec Condition="$([MSBuild]::IsOsPlatform('Windows'))" Command="if '$(IsDesktopBuild)' == true OR  $(IsDesktopBuild) == '' (&#xA;&#xA;&#xD;&#xA;&#xD;&#xA;xcopy /Y /S &quot;$(TargetDir)$(AssemblyName).dll&quot; &quot;$(AppData)\Speckle\Kits\Objects\&quot;&#xD;&#xA;&#xD;&#xA;)" />
-    <Exec Condition="$([MSBuild]::IsOsPlatform('Windows'))" Command="if '$(IsDesktopBuild)' == true OR  $(IsDesktopBuild) == '' (&#xA;&#xA;&#xD;&#xA;&#xD;&#xA;xcopy /Y /S &quot;$(MSBuildProjectDirectory)\..\Templates&quot; &quot;$(AppData)\Speckle\Kits\Objects\Templates\Revit\&quot;&#xD;&#xA;&#xD;&#xA;)" />
-  </Target>
-
-  <ItemGroup>
-    <None Include="..\..\..\..\logo.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-
-  <Import Project="..\ConverterRevitShared\ConverterRevitShared.projitems" Label="Shared" />
-</Project>
diff --git a/Objects/Converters/ConverterRevit/ConverterRevit2019/Properties/launchSettings.json b/Objects/Converters/ConverterRevit/ConverterRevit2019/Properties/launchSettings.json
deleted file mode 100644
index 6b92a52b4e..0000000000
--- a/Objects/Converters/ConverterRevit/ConverterRevit2019/Properties/launchSettings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "profiles": {
-    "ConverterRevit2019": {
-      "commandName": "Executable",
-      "executablePath": "C:\\Program Files\\Autodesk\\Revit 2019\\Revit.exe"
-    }
-  }
-}
\ No newline at end of file
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Categories.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Categories.cs
index 5ce51a7925..6533eed353 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Categories.cs
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Categories.cs
@@ -124,7 +124,7 @@ public static bool IsElementSupported(this Element e)
       BuiltInCategory.OST_Ramps,
       BuiltInCategory.OST_SpecialityEquipment,
       BuiltInCategory.OST_Rebar,
-#if !REVIT2019 && !REVIT2020 && !REVIT2021
+#if !REVIT2020 && !REVIT2021
       BuiltInCategory.OST_AudioVisualDevices,
       BuiltInCategory.OST_FireProtection,
       BuiltInCategory.OST_FoodServiceEquipment,
@@ -134,7 +134,7 @@ public static bool IsElementSupported(this Element e)
       BuiltInCategory.OST_TemporaryStructure,
       BuiltInCategory.OST_VerticalCirculation,
 #endif
-#if !REVIT2019 && !REVIT2020 && !REVIT2021 && !REVIT2022
+#if !REVIT2020 && !REVIT2021 && !REVIT2022
        BuiltInCategory.OST_MechanicalControlDevices,
 #endif
 
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/ConversionUtils.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/ConversionUtils.cs
index 53ab3ab16c..ad032f9ce4 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/ConversionUtils.cs
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/ConversionUtils.cs
@@ -6,12 +6,14 @@
 using Speckle.Core.Kits;
 using Speckle.Core.Models;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using DB = Autodesk.Revit.DB;
 using ElementType = Autodesk.Revit.DB.ElementType;
+using Duct = Objects.BuiltElements.Duct;
 using Floor = Objects.BuiltElements.Floor;
 using Level = Objects.BuiltElements.Level;
 using Line = Objects.Geometry.Line;
@@ -23,7 +25,6 @@ namespace Objects.Converter.Revit
 {
   public partial class ConverterRevit
   {
-
     #region hosted elements
 
     private bool ShouldConvertHostedElement(DB.Element element, DB.Element host)
@@ -45,6 +46,33 @@ private bool ShouldConvertHostedElement(DB.Element element, DB.Element host)
       }
       return true;
     }
+
+    private bool ShouldConvertHostedElement(DB.Element element, DB.Element host, ref Base extraProps)
+    {
+      //doesn't have a host, go ahead and convert
+      if (host == null)
+        return true;
+
+      // has been converted before (from a parent host), skip it
+      if (ConvertedObjectsList.IndexOf(element.UniqueId) != -1)
+        return false;
+
+      // the parent is in our selection list,skip it, as this element will be converted by the host element
+      if (ContextObjects.FindIndex(obj => obj.applicationId == host.UniqueId) != -1)
+      {
+        // there are certain elements in Revit that can be a host to another element
+        // yet not know it.
+        var hostedElementIds = GetDependentElementIds(host);
+        var elementId = element.Id;
+        if (!hostedElementIds.Where(b => b.IntegerValue == elementId.IntegerValue).Any())
+        {
+          extraProps["speckleHost"] = new Base() { applicationId = host.UniqueId };
+          ((dynamic)extraProps["speckleHost"])["category"] = host.Category.Name;
+        }
+        else return false;
+      }
+      return true;
+    }
     /// <summary>
     /// Gets the hosted element of a host and adds the to a Base object
     /// </summary>
@@ -53,7 +81,7 @@ private bool ShouldConvertHostedElement(DB.Element element, DB.Element host)
     public void GetHostedElements(Base @base, HostObject host, out List<string> notes)
     {
       notes = new List<string>();
-      var hostedElementIds = host.FindInserts(true, false, false, false);
+      var hostedElementIds = GetDependentElementIds(host);
       var convertedHostedElements = new List<Base>();
 
       if (!hostedElementIds.Any())
@@ -108,15 +136,31 @@ public void GetHostedElements(Base @base, HostObject host, out List<string> note
       }
     }
 
-    public ApplicationObject SetHostedElements(Base @base, HostObject host, ApplicationObject appObj)
+    public IList<ElementId> GetDependentElementIds(Element host)
+    {
+      if (host is HostObject hostObject)
+        return hostObject.FindInserts(true, false, false, false);
+
+      var typeFilter = new ElementIsElementTypeFilter(true);
+      var categoryFilter = new ElementMulticategoryFilter(
+        new List<BuiltInCategory>()
+        {
+          BuiltInCategory.OST_SketchLines,
+          BuiltInCategory.OST_WeakDims
+        }, true);
+      return host.GetDependentElements(new LogicalAndFilter(typeFilter, categoryFilter));
+    }
+
+    public ApplicationObject SetHostedElements(Base @base, Element host, ApplicationObject appObj)
     {
-      if (@base["elements"] != null && @base["elements"] is List<Base> elements)
+      if (@base != null && @base["elements"] != null && @base["elements"] is IList elements)
       {
         CurrentHostElement = host;
 
-        foreach (var obj in elements)
+        foreach (var el in elements)
         {
-          if (obj == null) continue;
+          if (el == null) continue;
+          if (!(el is Base obj)) continue;
 
           if (!CanConvertToNative(obj))
           {
@@ -207,7 +251,7 @@ public void GetAllRevitParamsAndIds(Base speckleElement, DB.Element revitElement
           speckleElement["category"] = category.Name;
         }
       }
-        
+
     }
 
     //private List<string> alltimeExclusions = new List<string> { 
@@ -339,7 +383,7 @@ private Parameter ParameterToSpeckle(DB.Parameter rp, bool isTypeParameter = fal
     /// </summary>
     /// <param name="revitElement"></param>
     /// <param name="speckleElement"></param>
-    public void SetInstanceParameters(Element revitElement, Base speckleElement)
+    public void SetInstanceParameters(Element revitElement, Base speckleElement, List<string> exclusions = null)
     {
       if (revitElement == null)
         return;
@@ -355,7 +399,11 @@ public void SetInstanceParameters(Element revitElement, Base speckleElement)
       // NOTE: we are using the ParametersMap here and not Parameters, as it's a much smaller list of stuff and 
       // Parameters most likely contains extra (garbage) stuff that we don't need to set anyways
       // so it's a much faster conversion. If we find that's not the case, we might need to change it in the future
-      var revitParameters = revitElement.ParametersMap.Cast<DB.Parameter>().Where(x => x != null && !x.IsReadOnly);
+      IEnumerable<DB.Parameter> revitParameters = null;
+      if (exclusions == null)
+        revitParameters = revitElement.ParametersMap.Cast<DB.Parameter>().Where(x => x != null && !x.IsReadOnly);
+      else
+        revitParameters = revitElement.ParametersMap.Cast<DB.Parameter>().Where(x => x != null && !x.IsReadOnly && !exclusions.Contains(GetParamInternalName(x)));
 
       // Here we are creating two  dictionaries for faster lookup
       // one uses the BuiltInName / GUID the other the name as Key
@@ -716,7 +764,7 @@ public DB.Element GetExistingElementByApplicationId(string applicationId)
         //eg: user sends some objects, moves them, receives them 
         element = Doc.GetElement(applicationId);
       }
-      else if(@ref.CreatedIds.Any())
+      else if (@ref.CreatedIds.Any())
       {
         //return the cached object, if it's still in the model
         element = Doc.GetElement(@ref.CreatedIds.First());
@@ -820,22 +868,15 @@ private DB.Transform GetReferencePointTransform(string type)
         case ProjectBase:
           if (projectPoint != null)
           {
-#if REVIT2019
-            var point = projectPoint.get_BoundingBox(null).Min;
-#else
+
             var point = projectPoint.Position;
-#endif
             referencePointTransform = DB.Transform.CreateTranslation(point); // rotation to base point is registered by survey point
           }
           break;
         case Survey:
           if (surveyPoint != null)
           {
-#if REVIT2019
-            var point = surveyPoint.get_BoundingBox(null).Min;
-#else
             var point = surveyPoint.Position;
-#endif
             var angle = projectPoint.get_Parameter(BuiltInParameter.BASEPOINT_ANGLETON_PARAM).AsDouble(); // !! retrieve survey point angle from project base point
             referencePointTransform = DB.Transform.CreateTranslation(point).Multiply(DB.Transform.CreateRotation(XYZ.BasisZ, angle));
           }
@@ -1167,7 +1208,6 @@ public bool TryAppendLineSafely(CurveArray curveArray, Line line, ApplicationObj
       }
     }
 
-
     public bool UnboundCurveIfSingle(DB.CurveArray array)
 
     {
@@ -1202,7 +1242,6 @@ public bool IsCurveClosed(DB.Curve nativeCurve, double tol = 1E-6)
       curveArray.Append(b);
 
       return (a, b);
-
     }
 
     public class FallbackToDxfException : Exception
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevit.Previews.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevit.Previews.cs
new file mode 100644
index 0000000000..6e35db1c8f
--- /dev/null
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevit.Previews.cs
@@ -0,0 +1,42 @@
+using ConverterRevitShared;
+using Objects.Geometry;
+using Speckle.Core.Models;
+using Speckle.Core.Models.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using Mesh = Objects.Geometry.Mesh;
+
+namespace Objects.Converter.Revit
+{
+  public partial class ConverterRevit
+  {
+    private ApplicationObject PreviewGeometry(Base @object)
+    {
+      var appObj = new ApplicationObject(@object.applicationId, @object.speckle_type);
+      DirectContext3DServer server = null;
+
+      Instance = this;
+      var meshes = @object.Flatten().Where(b => b is Mesh).Cast<Mesh>();
+      if (meshes == null || !meshes.Any())
+      {
+        appObj.Update(status: ApplicationObject.State.Failed, logItem: $"No displayable meshes found for object of type {@object.speckle_type}");
+        return appObj;
+      }
+      try
+      {
+        server = new DirectContext3DServer(meshes, Doc);
+        appObj.Update(status: ApplicationObject.State.Created);
+      }
+      catch (Exception ex)
+      {
+        appObj.Update(status: ApplicationObject.State.Failed, logItem: ex.Message);
+      }
+
+      appObj.Converted = new List<object> { server };
+      return appObj;
+    }
+  }
+}
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevit.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevit.cs
index e9a0f55124..0364c6e2f8 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevit.cs
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevit.cs
@@ -1,9 +1,8 @@
-using Autodesk.Revit.DB;
+using Autodesk.Revit.DB;
 using Objects.Organization;
 using Speckle.Core.Kits;
 using Speckle.Core.Models;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using BE = Objects.BuiltElements;
@@ -59,7 +58,7 @@ public partial class ConverterRevit : ISpeckleConverter
     /// <summary>
     /// Keeps track of the current host element that is creating any sub-objects it may have.
     /// </summary>
-    public HostObject CurrentHostElement { get; set; }
+    public Element CurrentHostElement { get; set; }
 
     /// <summary>
     /// Used when sending; keeps track of all the converted objects so far. Child elements first check in here if they should convert themselves again (they may have been converted as part of a parent's hosted elements).
@@ -119,11 +118,14 @@ public Base ConvertToSpeckle(object @object)
           returnObject = DirectShapeToSpeckle(o);
           break;
         case DB.FamilyInstance o:
-          returnObject = FamilyInstanceToSpeckle(o, out notes);
+          returnObject = o.MEPModel?.ConnectorManager?.Connectors?.Size > 0 ? NetworkToSpeckle(o, out notes) : FamilyInstanceToSpeckle(o, out notes);
           break;
         case DB.Floor o:
           returnObject = FloorToSpeckle(o, out notes);
           break;
+        case DB.FabricationPart o:
+          returnObject = FabricationPartToSpeckle(o, out notes);
+          break;
         case DB.Level o:
           returnObject = LevelToSpeckle(o);
           break;
@@ -161,25 +163,28 @@ public Base ConvertToSpeckle(object @object)
           returnObject = WallToSpeckle(o, out notes);
           break;
         case DB.Mechanical.Duct o:
-          returnObject = DuctToSpeckle(o, out notes);
+          returnObject = NetworkToSpeckle(o, out notes); 
           break;
         case DB.Mechanical.FlexDuct o:
-          returnObject = DuctToSpeckle(o);
+          returnObject = NetworkToSpeckle(o, out notes); 
           break;
         case DB.Mechanical.Space o:
           returnObject = SpaceToSpeckle(o);
           break;
         case DB.Plumbing.Pipe o:
-          returnObject = PipeToSpeckle(o);
+          returnObject = NetworkToSpeckle(o, out notes); 
           break;
         case DB.Plumbing.FlexPipe o:
-          returnObject = PipeToSpeckle(o);
+          returnObject = NetworkToSpeckle(o, out notes); 
           break;
         case DB.Electrical.Wire o:
           returnObject = WireToSpeckle(o);
           break;
         case DB.Electrical.CableTray o:
-          returnObject = CableTrayToSpeckle(o);
+          returnObject = NetworkToSpeckle(o, out notes); 
+          break;
+        case DB.Electrical.Conduit o:
+          returnObject = NetworkToSpeckle(o, out notes);
           break;
         //these should be handled by curtain walls
         case DB.CurtainGridLine _:
@@ -350,6 +355,11 @@ private BuiltInCategory GetObjectCategory(Base @object)
 
     public object ConvertToNative(Base @object)
     {
+      // Get setting for if the user is only trying to preview the geometry
+      Settings.TryGetValue("preview", out string isPreview);
+      if (bool.Parse(isPreview ?? "false") == true)
+        return PreviewGeometry(@object);
+
       // Get settings for receive direct meshes , assumes objects aren't nested like in Tekla Structures 
       Settings.TryGetValue("recieve-objects-mesh", out string recieveModelMesh);
       if (bool.Parse(recieveModelMesh ?? "false") == true)
@@ -479,6 +489,9 @@ public object ConvertToNative(Base @object)
         case BER.FamilyInstance o:
           return FamilyInstanceToNative(o);
 
+        case BE.Network o:
+          return NetworkToNative(o);
+
         case BE.Floor o:
           return FloorToNative(o);
 
@@ -524,6 +537,9 @@ public object ConvertToNative(Base @object)
         case BE.CableTray o:
           return CableTrayToNative(o);
 
+        case BE.Conduit o:
+          return ConduitToNative(o);
+
         case BE.Revit.RevitRailing o:
           return RailingToNative(o);
 
@@ -559,6 +575,15 @@ public object ConvertToNative(Base @object)
         case Other.BlockInstance o:
           return BlockInstanceToNative(o);
 
+        //hacky but the current comments camera is not a Base object
+        //used only from DUI and not for normal geometry conversion
+        case Base b:
+          var boo = b["isHackySpeckleCamera"] as bool?;
+          if (boo == true)
+            return ViewOrientation3DToNative(b);
+          return null;
+
+
         default:
           return null;
       }
@@ -595,6 +620,7 @@ public bool CanConvertToSpeckle(object @object)
         DB.Plumbing.FlexPipe _ => true,
         DB.Electrical.Wire _ => true,
         DB.Electrical.CableTray _ => true,
+        DB.Electrical.Conduit _ => true,
         DB.CurtainGridLine _ => true, //these should be handled by curtain walls
         DB.Architecture.BuildingPad _ => true,
         DB.Architecture.Stairs _ => true,
@@ -609,6 +635,7 @@ public bool CanConvertToSpeckle(object @object)
         DB.ElementType _ => true,
         DB.Grid _ => true,
         DB.ReferencePoint _ => true,
+        DB.FabricationPart _ => true,
 #if !REVIT2023
         DB.Structure.AnalyticalModelStick _ => true,
         DB.Structure.AnalyticalModelSurface _ => true,
@@ -678,20 +705,21 @@ public bool CanConvertToNative(Base @object)
         BE.Pipe _ => true,
         BE.Wire _ => true,
         BE.CableTray _ => true,
+        BE.Conduit _ => true,
         BE.Revit.RevitRailing _ => true,
         BER.ParameterUpdater _ => true,
         BE.View3D _ => true,
         BE.Room _ => true,
         BE.GridLine _ => true,
         BE.Space _ => true,
+        BE.Network _ => true,
         //Structural
         STR.Geometry.Element1D _ => true,
         STR.Geometry.Element2D _ => true,
         STR.Geometry.Node _ => true,
         STR.Analysis.Model _ => true,
         Other.BlockInstance _ => true,
-        _ => false
-
+        _ => false,
       };
     }
   }
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevitShared.projitems b/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevitShared.projitems
index 02a20fb8c8..cc35279030 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevitShared.projitems
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/ConverterRevitShared.projitems
@@ -1,69 +1,75 @@
-<?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>2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>ConverterRevitShared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Categories.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ConversionUtils.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ConverterRevit.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ConverterRevit.DxfImport.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ConverterRevit.SettingsHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertAdaptiveComponent.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertAnalyticalSurface.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertAnalyticalStick.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertAnalyticalNode.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertBeam.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertCableTray.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertDirectTeklaMeshElements.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertMaterial.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertMaterialQuantities.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertModel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRebar.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertBrace.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertBlock.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertGridLine.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertGroup.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertPipe.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRevitElement.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertArea.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertSpace.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertProfileWall.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertStructuralModel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertTeklaObjects.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertTopRail.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertWire.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFreeformElement.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\UpdateParameter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertView.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertProjectInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertCeiling.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRailing.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertStair.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertColumn.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertDirectShape.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertDuct.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFamilyInstance.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertBuildingPad.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFloor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertGeometry.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertLevel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertLocation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertMeshUtils.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertOpening.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertCurves.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRoof.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRoom.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertTopography.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFaceWall.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\Units.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertWall.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RevitVersionHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Revit\FamilyLoadOptions.cs" />
-  </ItemGroup>
+<?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>2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>ConverterRevitShared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Categories.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ConversionUtils.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ConverterRevit.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ConverterRevit.DxfImport.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ConverterRevit.Previews.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ConverterRevit.SettingsHelpers.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DirectContext3DServer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertAdaptiveComponent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertAnalyticalSurface.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertAnalyticalStick.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertAnalyticalNode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertBeam.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertConduit.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertCableTray.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertDirectTeklaMeshElements.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFabricationPart.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertMaterial.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertMaterialQuantities.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertNetwork.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRebar.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertBrace.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertBlock.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertGridLine.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertGroup.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertPipe.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRevitElement.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertArea.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertSpace.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertProfileWall.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertStructuralModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertTeklaObjects.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertTopRail.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertWire.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFreeformElement.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\UpdateParameter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertView.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertProjectInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertCeiling.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRailing.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertStair.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertColumn.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertDirectShape.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertDuct.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFamilyInstance.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertBuildingPad.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFloor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertGeometry.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertLevel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertLocation.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertMeshUtils.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertOpening.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertCurves.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRoof.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertRoom.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertTopography.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertFaceWall.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\Units.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Partial Classes\ConvertWall.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RevitVersionHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Revit\ConnectionPair.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Revit\FamilyLoadOptions.cs" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/DirectContext3DServer.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/DirectContext3DServer.cs
new file mode 100644
index 0000000000..a04425d06f
--- /dev/null
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/DirectContext3DServer.cs
@@ -0,0 +1,459 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.DirectContext3D;
+using Autodesk.Revit.DB.ExternalService;
+using Autodesk.Revit.UI;
+using Objects.Converter.Revit;
+using Speckle.Core.Models;
+using OG = Objects.Geometry;
+
+namespace Objects.Converter.Revit
+{
+  public partial class ConverterRevit
+  {
+    public static ConverterRevit Instance;
+    public class DirectContext3DServer : IDirectContext3DServer
+    {
+      private Document document;
+
+      private RenderingPassBufferStorage m_nonTransparentFaceBufferStorage;
+      private RenderingPassBufferStorage m_transparentFaceBufferStorage;
+      private RenderingPassBufferStorage m_edgeBufferStorage;
+      private Guid m_guid;
+      private IEnumerable<OG.Mesh> speckleMeshes;
+      public OG.Point minValues = new OG.Point(double.MaxValue, double.MaxValue, double.MaxValue);
+      public OG.Point maxValues = new OG.Point(double.MinValue, double.MinValue, double.MinValue);
+      public bool allMeshesStored => speckleMeshes.Count() == m_nonTransparentFaceBufferStorage?.Meshes.Count + m_transparentFaceBufferStorage?.Meshes.Count;
+      public DirectContext3DServer(IEnumerable<OG.Mesh> meshes, Document doc)
+      {
+        m_guid = Guid.NewGuid();
+        speckleMeshes = meshes;
+        document = doc;
+      }
+      public bool CanExecute(View dBView)
+      {
+        //if (!m_element.IsValidObject)
+        //  return false;
+        if (dBView.ViewType != ViewType.ThreeD)
+          return false;
+
+        Document doc = dBView.Document;
+        Document otherDoc = document;
+        return doc.Equals(otherDoc);
+      }
+      public string GetApplicationId() => " ";
+      public Outline GetBoundingBox(View dBView)
+      {
+        //return new Outline(new XYZ(0, 0, 0), new XYZ(2, 2, 2));
+
+        return new Outline
+          (
+            new XYZ(minValues.x, minValues.y, minValues.z),
+            new XYZ(maxValues.x, maxValues.y, maxValues.z)
+          );
+      }
+      public string GetDescription() => "Implements preview functionality for a Speckle Object";
+      public string GetName() => "Speckle Object Drawing Server";
+      public Guid GetServerId() => m_guid;
+      public ExternalServiceId GetServiceId() => ExternalServices.BuiltInExternalServices.DirectContext3DService;
+      public string GetSourceId() => " ";
+      public string GetVendorId() => "Speckle";
+      public void RenderScene(View dBView, DisplayStyle displayStyle)
+      {
+        try
+        {
+          // Populate geometry buffers if they are not initialized or need updating.
+          if (m_nonTransparentFaceBufferStorage == null || m_nonTransparentFaceBufferStorage.NeedsUpdate(displayStyle) ||
+              m_transparentFaceBufferStorage == null || m_transparentFaceBufferStorage.NeedsUpdate(displayStyle) ||
+              m_edgeBufferStorage == null || m_edgeBufferStorage.NeedsUpdate(displayStyle))
+          {
+
+            CreateBufferStorageForMeshes(displayStyle);
+          }
+
+          // Submit a subset of the geometry for drawing. Determine what geometry should be submitted based on
+          // the type of the rendering pass (opaque or transparent) and DisplayStyle (wireframe or shaded).
+
+          // If the server is requested to submit transparent geometry, DrawContext().IsTransparentPass()
+          // will indicate that the current rendering pass is for transparent objects.
+          RenderingPassBufferStorage faceBufferStorage = DrawContext.IsTransparentPass() ? m_transparentFaceBufferStorage : m_nonTransparentFaceBufferStorage;
+
+          // Conditionally submit triangle primitives (for non-wireframe views).
+          if (displayStyle != DisplayStyle.Wireframe &&
+              faceBufferStorage?.PrimitiveCount > 0)
+            DrawContext.FlushBuffer(faceBufferStorage.VertexBuffer,
+                                    faceBufferStorage.VertexBufferCount,
+                                    faceBufferStorage.IndexBuffer,
+                                    faceBufferStorage.IndexBufferCount,
+                                    faceBufferStorage.VertexFormat,
+                                    faceBufferStorage.EffectInstance, PrimitiveType.TriangleList, 0,
+                                    faceBufferStorage.PrimitiveCount);
+
+          // Conditionally submit line segment primitives.
+          if (displayStyle == DisplayStyle.Wireframe &&
+            displayStyle != DisplayStyle.Shading &&
+            m_edgeBufferStorage?.PrimitiveCount > 0)
+            DrawContext.FlushBuffer(m_edgeBufferStorage.VertexBuffer,
+                                    m_edgeBufferStorage.VertexBufferCount,
+                                    m_edgeBufferStorage.IndexBuffer,
+                                    m_edgeBufferStorage.IndexBufferCount,
+                                    m_edgeBufferStorage.VertexFormat,
+                                    m_edgeBufferStorage.EffectInstance, PrimitiveType.LineList, 0,
+                                    m_edgeBufferStorage.PrimitiveCount);
+        }
+        catch (Exception e)
+        {
+          System.Diagnostics.Debug.WriteLine(e.ToString());
+        }
+      }
+      public bool UseInTransparentPass(View dBView) => true;
+      public bool UsesHandles() => false;
+
+      private void CreateBufferStorageForMeshes(DisplayStyle displayStyle)
+      {
+        if (allMeshesStored)
+          RefreshBufferStorage(displayStyle);
+        else
+          foreach (var mesh in speckleMeshes)
+            CreateBufferStorageForMesh(mesh, displayStyle);
+      }
+
+      private void RefreshBufferStorage(DisplayStyle displayStyle)
+      {
+        m_nonTransparentFaceBufferStorage.DisplayStyle = displayStyle;
+        m_transparentFaceBufferStorage.DisplayStyle = displayStyle;
+        m_edgeBufferStorage.DisplayStyle = displayStyle;
+
+        // Fill out buffers with primitives based on the intermediate information about faces and edges.
+        ProcessFaces(m_nonTransparentFaceBufferStorage);
+        ProcessFaces(m_transparentFaceBufferStorage);
+        if (displayStyle == DisplayStyle.Wireframe)
+          ProcessEdges(m_edgeBufferStorage);
+      }
+
+      // Initialize and populate buffers that hold graphics primitives, set up related parameters that are needed for drawing.
+      private void CreateBufferStorageForMesh(OG.Mesh mesh, DisplayStyle displayStyle)
+      {
+        ColorWithTransparency color = null;
+        if (mesh["renderMaterial"] is Objects.Other.RenderMaterial mat)
+        {
+          // System.Drawing.Color treats the A value as opacity, with 255 being fully opaque.
+          // Revit interprets the A value as transparency, with 0 being fully opaque and 255 being fully transparent
+          // so we need to translate the A value as below
+          color = new ColorWithTransparency(mat.diffuseColor.R, mat.diffuseColor.G, mat.diffuseColor.B, Math.Max((uint)(255 - mat.diffuseColor.A * mat.opacity), 0));
+        }
+
+        color ??= new ColorWithTransparency(255, 255, 255, 0);
+        var meshInfo = new SpeckleMeshInfo(mesh, color, ref minValues, ref maxValues);
+
+        m_nonTransparentFaceBufferStorage ??= new RenderingPassBufferStorage(displayStyle);
+        m_transparentFaceBufferStorage ??= new RenderingPassBufferStorage(displayStyle);
+        m_edgeBufferStorage ??= new RenderingPassBufferStorage(displayStyle);
+
+        if (color.GetTransparency() != 0)
+        {
+          m_transparentFaceBufferStorage.Meshes.Add(meshInfo);
+          m_transparentFaceBufferStorage.VertexBufferCount += meshInfo.Mesh.VerticesCount;
+          m_transparentFaceBufferStorage.PrimitiveCount += meshInfo.Faces.Count;
+        }
+        else
+        {
+          m_nonTransparentFaceBufferStorage.Meshes.Add(meshInfo);
+          m_nonTransparentFaceBufferStorage.VertexBufferCount += meshInfo.Mesh.VerticesCount;
+          m_nonTransparentFaceBufferStorage.PrimitiveCount += meshInfo.Faces.Count;
+        }
+
+        foreach (var xyzs in meshInfo.XYZs)
+        {
+          m_edgeBufferStorage.VertexBufferCount += xyzs.Count;
+          m_edgeBufferStorage.PrimitiveCount += xyzs.Count - 1;
+          m_edgeBufferStorage.EdgeXYZs.Add(xyzs);
+        }
+
+        RefreshBufferStorage(displayStyle);
+      }
+
+      private void ProcessFaces(RenderingPassBufferStorage bufferStorage)
+      {
+        List<SpeckleMeshInfo> meshes = bufferStorage.Meshes;
+        List<int> numVerticesInMeshesBefore = new List<int>();
+        if (meshes.Count == 0) return;
+
+        bool useNormals = bufferStorage.DisplayStyle == DisplayStyle.Shading ||
+           bufferStorage.DisplayStyle == DisplayStyle.ShadingWithEdges;
+
+        // Vertex attributes are stored sequentially in vertex buffers. The attributes can include position, normal vector, and color.
+        // All vertices within a vertex buffer must have the same format. Possible formats are enumerated by VertexFormatBits.
+        // Vertex format also determines the type of rendering effect that can be used with the vertex buffer. In this sample,
+        // the color is always encoded in the vertex attributes.
+
+        bufferStorage.FormatBits = useNormals ? VertexFormatBits.PositionNormalColored : VertexFormatBits.PositionColored;
+
+        // The format of the vertices determines the size of the vertex buffer.
+        int vertexBufferSizeInFloats = (useNormals ? VertexPositionNormalColored.GetSizeInFloats() : VertexPositionColored.GetSizeInFloats()) *
+           bufferStorage.VertexBufferCount;
+        numVerticesInMeshesBefore.Add(0);
+
+        bufferStorage.VertexBuffer = new VertexBuffer(vertexBufferSizeInFloats);
+        bufferStorage.VertexBuffer.Map(vertexBufferSizeInFloats);
+
+        if (useNormals) //must use normals for shaded displayStyle
+        {
+          // A VertexStream is used to write data into a VertexBuffer.
+          VertexStreamPositionNormalColored vertexStream = bufferStorage.VertexBuffer.GetVertexStreamPositionNormalColored();
+          foreach (SpeckleMeshInfo meshInfo in meshes)
+          {
+            OG.Mesh mesh = meshInfo.Mesh;
+            var addedVertexIndicies = new List<int>();
+            for (var i = 0; i < meshInfo.Faces.Count; i++)
+            {
+              foreach (var index in meshInfo.Faces[i])
+              {
+                if (addedVertexIndicies.Contains(index))
+                  continue;
+
+                var p1 = meshInfo.Vertices.ElementAt(index);
+                vertexStream.AddVertex(new VertexPositionNormalColored(p1, meshInfo.Normals.ElementAt(i), meshInfo.ColorWithTransparency));
+                addedVertexIndicies.Add(index);
+              }
+            }
+            numVerticesInMeshesBefore.Add(numVerticesInMeshesBefore.Last() + mesh.VerticesCount);
+          }
+        }
+        else
+        {
+          // A VertexStream is used to write data into a VertexBuffer.
+          VertexStreamPositionColored vertexStream = bufferStorage.VertexBuffer.GetVertexStreamPositionColored();
+          foreach (SpeckleMeshInfo meshInfo in meshes)
+          {
+            OG.Mesh mesh = meshInfo.Mesh;
+
+            foreach (XYZ vertex in meshInfo.Vertices)
+              vertexStream.AddVertex(new VertexPositionColored(vertex, meshInfo.ColorWithTransparency));
+
+            numVerticesInMeshesBefore.Add(numVerticesInMeshesBefore.Last() + mesh.VerticesCount);
+          }
+        }
+
+        bufferStorage.VertexBuffer.Unmap();
+
+        // Primitives are specified using a pair of vertex and index buffers. An index buffer contains a sequence of indices into
+        // the associated vertex buffer, each index referencing a particular vertex.
+
+        int meshNumber = 0;
+        bufferStorage.IndexBufferCount = bufferStorage.PrimitiveCount * IndexTriangle.GetSizeInShortInts();
+        int indexBufferSizeInShortInts = 1 * bufferStorage.IndexBufferCount;
+        bufferStorage.IndexBuffer = new IndexBuffer(indexBufferSizeInShortInts);
+        bufferStorage.IndexBuffer.Map(indexBufferSizeInShortInts);
+        {
+          // An IndexStream is used to write data into an IndexBuffer.
+          IndexStreamTriangle indexStream = bufferStorage.IndexBuffer.GetIndexStreamTriangle();
+          foreach (SpeckleMeshInfo meshInfo in meshes)
+          {
+            var mesh = meshInfo.Mesh;
+            int startIndex = numVerticesInMeshesBefore[meshNumber];
+            foreach (var face in meshInfo.Faces)
+            {
+              // Add three indices that define a triangle.
+              indexStream.AddTriangle(new IndexTriangle(startIndex + face[0],
+                                                        startIndex + face[1],
+                                                        startIndex + face[2]));
+            }
+            meshNumber++;
+          }
+        }
+        bufferStorage.IndexBuffer.Unmap();
+
+
+        // VertexFormat is a specification of the data that is associated with a vertex (e.g., position).
+        bufferStorage.VertexFormat = new VertexFormat(bufferStorage.FormatBits);
+        // Effect instance is a specification of the appearance of geometry. For example, it may be used to specify color, if there is no color information provided with the vertices.
+        bufferStorage.EffectInstance = new EffectInstance(bufferStorage.FormatBits);
+      }
+
+      // A helper function, analogous to ProcessFaces.
+      private void ProcessEdges(RenderingPassBufferStorage bufferStorage)
+      {
+        List<IList<XYZ>> edges = bufferStorage.EdgeXYZs;
+        if (edges.Count == 0)
+          return;
+
+        // Edges are encoded as line segment primitives whose vertices contain only position information.
+        bufferStorage.FormatBits = VertexFormatBits.Position;
+
+        int edgeVertexBufferSizeInFloats = VertexPosition.GetSizeInFloats() * bufferStorage.VertexBufferCount;
+        List<int> numVerticesInEdgesBefore = new List<int>();
+        numVerticesInEdgesBefore.Add(0);
+
+        bufferStorage.VertexBuffer = new VertexBuffer(edgeVertexBufferSizeInFloats);
+        bufferStorage.VertexBuffer.Map(edgeVertexBufferSizeInFloats);
+        {
+          VertexStreamPosition vertexStream = bufferStorage.VertexBuffer.GetVertexStreamPosition();
+          foreach (IList<XYZ> xyzs in edges)
+          {
+            foreach (XYZ vertex in xyzs)
+            {
+              vertexStream.AddVertex(new VertexPosition(vertex));
+            }
+
+            numVerticesInEdgesBefore.Add(numVerticesInEdgesBefore.Last() + xyzs.Count);
+          }
+        }
+        bufferStorage.VertexBuffer.Unmap();
+
+        int edgeNumber = 0;
+        bufferStorage.IndexBufferCount = bufferStorage.PrimitiveCount * IndexLine.GetSizeInShortInts();
+        int indexBufferSizeInShortInts = 1 * bufferStorage.IndexBufferCount;
+        bufferStorage.IndexBuffer = new IndexBuffer(indexBufferSizeInShortInts);
+        bufferStorage.IndexBuffer.Map(indexBufferSizeInShortInts);
+        {
+          IndexStreamLine indexStream = bufferStorage.IndexBuffer.GetIndexStreamLine();
+          foreach (IList<XYZ> xyzs in edges)
+          {
+            int startIndex = numVerticesInEdgesBefore[edgeNumber];
+            for (int i = 1; i < xyzs.Count; i++)
+            {
+              // Add two indices that define a line segment.
+              indexStream.AddLine(new IndexLine((int)(startIndex + i - 1),
+                                                (int)(startIndex + i)));
+            }
+            edgeNumber++;
+          }
+        }
+        bufferStorage.IndexBuffer.Unmap();
+
+
+        bufferStorage.VertexFormat = new VertexFormat(bufferStorage.FormatBits);
+        bufferStorage.EffectInstance = new EffectInstance(bufferStorage.FormatBits);
+      }
+
+      #region Helper classes
+
+      // A class that brings together all the data and rendering parameters that are needed to draw one sequence of primitives (e.g., triangles)
+      // with the same format and appearance.
+      class RenderingPassBufferStorage
+      {
+        public RenderingPassBufferStorage(DisplayStyle displayStyle)
+        {
+          DisplayStyle = displayStyle;
+          Meshes = new List<SpeckleMeshInfo>();
+          EdgeXYZs = new List<IList<XYZ>>();
+        }
+
+        public bool NeedsUpdate(DisplayStyle newDisplayStyle)
+        {
+          if (newDisplayStyle != DisplayStyle)
+            return true;
+
+          if (PrimitiveCount > 0)
+            if (VertexBuffer == null || !VertexBuffer.IsValid() ||
+                IndexBuffer == null || !IndexBuffer.IsValid() ||
+                VertexFormat == null || !VertexFormat.IsValid() ||
+                EffectInstance == null || !EffectInstance.IsValid())
+              return true;
+
+          return false;
+        }
+
+        public DisplayStyle DisplayStyle { get; set; }
+
+        public VertexFormatBits FormatBits { get; set; }
+
+        public List<SpeckleMeshInfo> Meshes { get; set; }
+        public List<IList<XYZ>> EdgeXYZs { get; set; }
+
+        public int PrimitiveCount { get; set; }
+        public int VertexBufferCount { get; set; }
+        public int IndexBufferCount { get; set; }
+        public VertexBuffer VertexBuffer { get; set; }
+        public IndexBuffer IndexBuffer { get; set; }
+        public VertexFormat VertexFormat { get; set; }
+        public EffectInstance EffectInstance { get; set; }
+      }
+
+      public class SpeckleMeshInfo
+      {
+        public OG.Mesh Mesh;
+        public List<XYZ> Vertices = new List<XYZ>();
+        public List<int[]> Faces;
+        public List<List<XYZ>> XYZs = new List<List<XYZ>>();
+        public List<XYZ> Normals = new List<XYZ>();
+        public ColorWithTransparency ColorWithTransparency;
+
+        public SpeckleMeshInfo(OG.Mesh mesh, ColorWithTransparency color, ref OG.Point minValues, ref OG.Point maxValue)
+        {
+          Mesh = mesh;
+          ColorWithTransparency = color;
+          Faces = GetFaceIndices(mesh).ToList();
+
+          foreach(var vertex in mesh.GetPoints())
+            Vertices.Add(Instance.PointToNative(vertex));
+
+          var edges = new List<(int, int)>();
+          var faceIndex = 0;
+          foreach (var indices in Faces)
+          {
+            var vectorA = Vertices.ElementAt(indices[0]);
+            var vectorB = Vertices.ElementAt(indices[1]);
+            var vectorC = Vertices.ElementAt(indices[2]);
+            var result = (vectorB - vectorA).CrossProduct(vectorC - vectorA).Normalize();
+
+            try
+            {
+              Normals.Add(result);
+            }
+            catch (Exception ex)
+            {
+              Normals.Add(new XYZ(0, 0, 1));
+            }
+
+            for (var j = 0; j < indices.Length; j++)
+            {
+              var iA = indices[j];
+              var iB = indices[(j + 1) % indices.Length];
+              var temp = iA;
+              iA = temp < iB ? iA : iB;
+              iB = temp < iB ? iB : temp;
+
+              if (edges.Contains((iA, iB)))
+                continue;
+
+              edges.Add((iA, iB));
+              var p1 = Vertices.ElementAt(iA);
+              var p2 = Vertices.ElementAt(iB);
+              XYZs.Add(new List<XYZ> { p1, p2 });
+
+              minValues.x = Math.Min(minValues.x, Math.Min(p1.X, p2.X));
+              minValues.y = Math.Min(minValues.y, Math.Min(p1.Y, p2.Y));
+              minValues.z = Math.Min(minValues.z, Math.Min(p1.Z, p2.Z));
+
+              maxValue.x = Math.Max(maxValue.x, Math.Max(p1.X, p2.X));
+              maxValue.y = Math.Max(maxValue.y, Math.Max(p1.Y, p2.Y));
+              maxValue.z = Math.Max(maxValue.z, Math.Max(p1.Z, p2.Z));
+            }
+            faceIndex++;
+          }
+        }
+        public static IEnumerable<int[]> GetFaceIndices(OG.Mesh mesh)
+        {
+          var i = 0;
+          while (i < mesh.faces.Count)
+          {
+            var n = mesh.faces[i];
+            if (n < 3) n += 3; // 0 -> 3, 1 -> 4 to preserve backwards compatibility
+
+            var points = mesh.faces.GetRange(i + 1, n).ToArray();
+            yield return points;
+            i += n + 1;
+          }
+        }
+      }
+
+      #endregion
+    }
+  }
+}
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertAnalyticalStick.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertAnalyticalStick.cs
index 4399a0283c..1286e9f874 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertAnalyticalStick.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertAnalyticalStick.cs	
@@ -18,10 +18,10 @@ public partial class ConverterRevit
     public ApplicationObject AnalyticalStickToNative(Element1D speckleStick)
     {
       ApplicationObject appObj = null;
-      XYZ offset1 = VectorToNative(speckleStick.end1Offset ?? new Geometry.Vector(0,0,0));
-      XYZ offset2 = VectorToNative(speckleStick.end2Offset ?? new Geometry.Vector(0,0,0));
+      XYZ offset1 = VectorToNative(speckleStick.end1Offset ?? new Geometry.Vector(0, 0, 0));
+      XYZ offset2 = VectorToNative(speckleStick.end2Offset ?? new Geometry.Vector(0, 0, 0));
 
-#if REVIT2019 || REVIT2020 || REVIT2021 || REVIT2022
+#if REVIT2020 || REVIT2021 || REVIT2022
       appObj = CreatePhysicalMember(speckleStick);
       DB.FamilyInstance physicalMember = (DB.FamilyInstance)appObj.Converted.FirstOrDefault();
       SetAnalyticalProps(physicalMember, speckleStick, offset1, offset2);
@@ -55,6 +55,8 @@ public ApplicationObject AnalyticalStickToNative(Element1D speckleStick)
       }
 
       AnalyticalMember revitMember = null;
+      DB.FamilyInstance physicalMember = null;
+
       if (docObj != null && docObj is AnalyticalMember analyticalMember)
       {      
         // update location
@@ -64,6 +66,14 @@ public ApplicationObject AnalyticalStickToNative(Element1D speckleStick)
         analyticalMember.SectionTypeId = familySymbol.Id;
         isUpdate = true;
         revitMember = analyticalMember;
+
+        if (analyticalToPhysicalManager.HasAssociation(revitMember.Id))
+        {
+          var physicalMemberId = analyticalToPhysicalManager.GetAssociatedElementId(revitMember.Id);
+          physicalMember = (DB.FamilyInstance)Doc.GetElement(physicalMemberId);
+          if (physicalMember.Symbol != familySymbol)
+            physicalMember.Symbol = familySymbol;
+        }
       }
 
       //create family instance
@@ -77,7 +87,6 @@ public ApplicationObject AnalyticalStickToNative(Element1D speckleStick)
       // set or update analytical properties
       SetAnalyticalProps(revitMember, speckleStick, offset1, offset2);
 
-      DB.FamilyInstance physicalMember = null;
       // if there isn't an associated physical element to the analytical element, create it
       if (!analyticalToPhysicalManager.HasAssociation(revitMember.Id))
       {
@@ -106,7 +115,7 @@ private ApplicationObject CreatePhysicalMember(Element1D speckleStick)
           //This only works for CSIC sections now for sure. Need to test on other sections
           revitBeam.type = speckleStick.property.name.Replace('X', 'x');
           revitBeam.baseLine = speckleStick.baseLine;
-#if REVIT2019 || REVIT2020 || REVIT2021 || REVIT2022
+#if REVIT2020 || REVIT2021 || REVIT2022
           revitBeam.applicationId = speckleStick.applicationId;
 #endif
           appObj = BeamToNative(revitBeam);
@@ -117,7 +126,7 @@ private ApplicationObject CreatePhysicalMember(Element1D speckleStick)
           RevitBrace revitBrace = new RevitBrace();
           revitBrace.type = speckleStick.property.name.Replace('X', 'x');
           revitBrace.baseLine = speckleStick.baseLine;
-#if REVIT2019 || REVIT2020 || REVIT2021 || REVIT2022
+#if REVIT2020 || REVIT2021 || REVIT2022
           revitBrace.applicationId = speckleStick.applicationId;
 #endif
           appObj = BraceToNative(revitBrace);
@@ -129,7 +138,7 @@ private ApplicationObject CreatePhysicalMember(Element1D speckleStick)
           revitColumn.type = speckleStick.property.name.Replace('X', 'x');
           revitColumn.baseLine = speckleStick.baseLine;
           revitColumn.units = speckleStick.units;
-#if REVIT2019 || REVIT2020 || REVIT2021 || REVIT2022
+#if REVIT2020 || REVIT2021 || REVIT2022
           revitColumn.applicationId = speckleStick.applicationId;
 #endif
           appObj = ColumnToNative(revitColumn);
@@ -141,17 +150,19 @@ private ApplicationObject CreatePhysicalMember(Element1D speckleStick)
 
     private void SetAnalyticalProps(Element element, Element1D element1d, XYZ offset1, XYZ offset2)
     {
+      Func<char, bool> releaseConvert = rel => rel == 'R';
+
 #if !REVIT2023
       var analyticalModel = (AnalyticalModelStick)element.GetAnalyticalModel();
-      analyticalModel.SetReleases(true, Convert.ToBoolean(element1d.end1Releases.stiffnessX), Convert.ToBoolean(element1d.end1Releases.stiffnessY), Convert.ToBoolean(element1d.end1Releases.stiffnessZ), Convert.ToBoolean(element1d.end1Releases.stiffnessXX), Convert.ToBoolean(element1d.end1Releases.stiffnessYY), Convert.ToBoolean(element1d.end1Releases.stiffnessZZ));
-      analyticalModel.SetReleases(false, Convert.ToBoolean(element1d.end2Releases.stiffnessX), Convert.ToBoolean(element1d.end2Releases.stiffnessY), Convert.ToBoolean(element1d.end2Releases.stiffnessZ), Convert.ToBoolean(element1d.end2Releases.stiffnessXX), Convert.ToBoolean(element1d.end2Releases.stiffnessYY), Convert.ToBoolean(element1d.end2Releases.stiffnessZZ));
+      analyticalModel.SetReleases(true, releaseConvert(element1d.end1Releases.code[0]), releaseConvert(element1d.end1Releases.code[1]), releaseConvert(element1d.end1Releases.code[2]), releaseConvert(element1d.end1Releases.code[3]), releaseConvert(element1d.end1Releases.code[4]), releaseConvert(element1d.end1Releases.code[5]));
+      analyticalModel.SetReleases(false, releaseConvert(element1d.end2Releases.code[0]), releaseConvert(element1d.end2Releases.code[1]), releaseConvert(element1d.end2Releases.code[2]), releaseConvert(element1d.end2Releases.code[3]), releaseConvert(element1d.end2Releases.code[4]), releaseConvert(element1d.end2Releases.code[5]));
       analyticalModel.SetOffset(AnalyticalElementSelector.StartOrBase, offset1);
       analyticalModel.SetOffset(AnalyticalElementSelector.EndOrTop, offset2);
 #else
       if (element is AnalyticalMember analyticalMember)
       {
-        analyticalMember.SetReleaseConditions(new ReleaseConditions(true, Convert.ToBoolean(element1d.end1Releases.stiffnessX), Convert.ToBoolean(element1d.end1Releases.stiffnessY), Convert.ToBoolean(element1d.end1Releases.stiffnessZ), Convert.ToBoolean(element1d.end1Releases.stiffnessXX), Convert.ToBoolean(element1d.end1Releases.stiffnessYY), Convert.ToBoolean(element1d.end1Releases.stiffnessZZ)));
-        analyticalMember.SetReleaseConditions(new ReleaseConditions(false, Convert.ToBoolean(element1d.end2Releases.stiffnessX), Convert.ToBoolean(element1d.end2Releases.stiffnessY), Convert.ToBoolean(element1d.end2Releases.stiffnessZ), Convert.ToBoolean(element1d.end2Releases.stiffnessXX), Convert.ToBoolean(element1d.end2Releases.stiffnessYY), Convert.ToBoolean(element1d.end2Releases.stiffnessZZ)));
+        analyticalMember.SetReleaseConditions(new ReleaseConditions(true, releaseConvert(element1d.end1Releases.code[0]), releaseConvert(element1d.end1Releases.code[1]), releaseConvert(element1d.end1Releases.code[2]), releaseConvert(element1d.end1Releases.code[3]), releaseConvert(element1d.end1Releases.code[4]), releaseConvert(element1d.end1Releases.code[5])));
+        analyticalMember.SetReleaseConditions(new ReleaseConditions(false, releaseConvert(element1d.end2Releases.code[0]), releaseConvert(element1d.end2Releases.code[1]), releaseConvert(element1d.end2Releases.code[2]), releaseConvert(element1d.end2Releases.code[3]), releaseConvert(element1d.end2Releases.code[4]), releaseConvert(element1d.end2Releases.code[5])));
       }
       //TODO Set offsets
 #endif
@@ -202,21 +213,16 @@ private Element1D AnalyticalStickToSpeckle(AnalyticalModelStick revitStick)
       var prop = new Property1D();
 
       var stickFamily = (Autodesk.Revit.DB.FamilyInstance)revitStick.Document.GetElement(revitStick.GetElementId());
-      var section = stickFamily.Symbol.GetStructuralSection();
 
-      var speckleSection = GetSectionProfile(section);
+      var speckleSection = GetSectionProfile(stickFamily.Symbol);
 
-      var materialType = stickFamily.StructuralMaterialType;
       var structMat = (DB.Material)stickFamily.Document.GetElement(stickFamily.StructuralMaterialId);
       if (structMat == null)
         structMat = (DB.Material)stickFamily.Document.GetElement(stickFamily.Symbol.get_Parameter(BuiltInParameter.STRUCTURAL_MATERIAL_PARAM).AsElementId());
-      var materialAsset = ((PropertySetElement)structMat.Document.GetElement(structMat.StructuralAssetId)).GetStructuralAsset();
 
-      var name = stickFamily.Document.GetElement(stickFamily.StructuralMaterialId).Name;
-      Structural.Materials.StructuralMaterial speckleMaterial = GetStructuralMaterial(materialType, materialAsset, name);
 
       prop.profile = speckleSection;
-      prop.material = speckleMaterial;
+      prop.material = GetStructuralMaterial(structMat);
       prop.name = revitStick.Document.GetElement(revitStick.GetElementId()).Name;
 
       var structuralElement = revitStick.Document.GetElement(revitStick.GetElementId());
@@ -273,19 +279,14 @@ private Element1D AnalyticalStickToSpeckle(AnalyticalMember revitStick)
   
       var stickFamily = (Autodesk.Revit.DB.FamilySymbol)revitStick.Document.GetElement(revitStick.SectionTypeId);
 
-      var speckleSection = GetSectionProfile(stickFamily.GetStructuralSection());
+      var speckleSection = GetSectionProfile(stickFamily);
 
-      var materialType = stickFamily.StructuralMaterialType;
       var structMat = (DB.Material)stickFamily.Document.GetElement(revitStick.MaterialId);
       if (structMat == null)
         structMat = (DB.Material)stickFamily.Document.GetElement(stickFamily.get_Parameter(BuiltInParameter.STRUCTURAL_MATERIAL_PARAM).AsElementId());
-      var materialAsset = ((PropertySetElement)structMat.Document.GetElement(structMat.StructuralAssetId)).GetStructuralAsset();
-
-      var name = structMat.Document.GetElement(structMat.StructuralAssetId).Name;
-      var speckleMaterial = GetStructuralMaterial(materialType, materialAsset, name);
 
       prop.profile = speckleSection;
-      prop.material = speckleMaterial;
+      prop.material = GetStructuralMaterial(structMat);
       prop.name = stickFamily.Name;
 
       var mark = GetParamValue<string>(stickFamily, BuiltInParameter.ALL_MODEL_MARK);
@@ -359,8 +360,12 @@ private void SetEndReleases(Element revitStick, ref Element1D speckleElement1D)
       }
     }
 
-    private SectionProfile GetSectionProfile(StructuralSection section)
+    private SectionProfile GetSectionProfile(FamilySymbol familySymbol)
     {
+      var section = familySymbol.GetStructuralSection();
+      if (section == null)
+        return null;
+
       var speckleSection = new SectionProfile();
       speckleSection.name = section.StructuralSectionShapeName;
 
@@ -488,30 +493,35 @@ private SectionProfile GetSectionProfile(StructuralSection section)
       return speckleSection;
     }
 
-    private StructuralMaterial GetStructuralMaterial(StructuralMaterialType materialType, StructuralAsset materialAsset, string name)
+    private StructuralMaterial GetStructuralMaterial(Material material)
     {
-      Structural.Materials.StructuralMaterial speckleMaterial = null;
+      if (material == null)
+        return null;
 
-      if (materialType == StructuralMaterialType.Undefined)
+      StructuralAsset materialAsset = null;
+      string name = null;
+      if (material.StructuralAssetId != ElementId.InvalidElementId)
       {
-        switch (materialAsset.StructuralAssetClass)
-        {
-          case StructuralAssetClass.Metal:
-            materialType = StructuralMaterialType.Steel;
-            break;
-          case StructuralAssetClass.Concrete:
-            materialType = StructuralMaterialType.Concrete;
-            break;
-          case StructuralAssetClass.Wood:
-            materialType = StructuralMaterialType.Wood;
-            break;
-        }
+        materialAsset = ((PropertySetElement)material.Document.GetElement(material.StructuralAssetId)).GetStructuralAsset();
+
+        name = material.Document.GetElement(material.StructuralAssetId)?.Name;
       }
+      var materialName = material.MaterialClass;
+      var materialType = GetMaterialType(materialName);
+      return GetStructuralMaterial(materialType, materialAsset, name);
+    }
 
+    private StructuralMaterial GetStructuralMaterial(StructuralMaterialType materialType, StructuralAsset materialAsset, string name)
+    {
+      Structural.Materials.StructuralMaterial speckleMaterial = null;
+
+      if (materialType == StructuralMaterialType.Undefined && materialAsset != null)
+        materialType = GetMaterialType(materialAsset);
+
+      name ??= materialType.ToString();
       switch (materialType)
       {
         case StructuralMaterialType.Concrete:
-
           var concreteMaterial = new Concrete
           {
             name = name,
@@ -519,20 +529,25 @@ private StructuralMaterial GetStructuralMaterial(StructuralMaterialType material
             grade = null,
             designCode = null,
             codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X,
-            compressiveStrength = materialAsset.ConcreteCompression,
             tensileStrength = 0,
             flexuralStrength = 0,
             maxCompressiveStrain = 0,
             maxTensileStrain = 0,
             maxAggregateSize = 0,
-            lightweight = materialAsset.Lightweight,
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X,
-            density = materialAsset.Density,
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X,
             dampingRatio = 0
           };
+
+          if (materialAsset != null)
+          {
+            concreteMaterial.elasticModulus = materialAsset.YoungModulus.X;
+            concreteMaterial.compressiveStrength = materialAsset.ConcreteCompression;
+            concreteMaterial.lightweight = materialAsset.Lightweight;
+            concreteMaterial.poissonsRatio = materialAsset.PoissonRatio.X;
+            concreteMaterial.shearModulus = materialAsset.ShearModulus.X;
+            concreteMaterial.density = materialAsset.Density;
+            concreteMaterial.thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X;
+          }
+
           speckleMaterial = concreteMaterial;
           break;
         case StructuralMaterialType.Steel:
@@ -540,19 +555,24 @@ private StructuralMaterial GetStructuralMaterial(StructuralMaterialType material
           {
             name = name,
             materialType = Structural.MaterialType.Steel,
-            grade = materialAsset.Name,
             designCode = null,
             codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X, // Newtons per foot meter 
-            yieldStrength = materialAsset.MinimumYieldStress, // Newtons per foot meter
-            ultimateStrength = materialAsset.MinimumTensileStrength, // Newtons per foot meter
             maxStrain = 0,
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X, // Newtons per foot meter
-            density = materialAsset.Density, // kilograms per cubed feet 
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X, // inverse Kelvin
-            dampingRatio = 0
+            dampingRatio = 0,
           };
+
+          if (materialAsset != null)
+          {
+            steelMaterial.grade = materialAsset.Name;
+            steelMaterial.elasticModulus = materialAsset.YoungModulus.X; // Newtons per foot meter 
+            steelMaterial.yieldStrength = materialAsset.MinimumYieldStress; // Newtons per foot meter
+            steelMaterial.ultimateStrength = materialAsset.MinimumTensileStrength; // Newtons per foot meter
+            steelMaterial.poissonsRatio = materialAsset.PoissonRatio.X;
+            steelMaterial.shearModulus = materialAsset.ShearModulus.X; // Newtons per foot meter
+            steelMaterial.density = materialAsset.Density; // kilograms per cubed feet 
+            steelMaterial.thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X; // inverse Kelvin
+          }
+
           speckleMaterial = steelMaterial;
           break;
         case StructuralMaterialType.Wood:
@@ -560,22 +580,27 @@ private StructuralMaterial GetStructuralMaterial(StructuralMaterialType material
           {
             name = name,
             materialType = Structural.MaterialType.Timber,
-            grade = materialAsset.WoodGrade,
             designCode = null,
             codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X, // Newtons per foot meter 
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X, // Newtons per foot meter
-            density = materialAsset.Density, // kilograms per cubed feet 
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X, // inverse Kelvin
-            species = materialAsset.WoodSpecies,
             dampingRatio = 0
           };
-          timberMaterial["bendingStrength"] = materialAsset.WoodBendingStrength;
-          timberMaterial["parallelCompressionStrength"] = materialAsset.WoodParallelCompressionStrength;
-          timberMaterial["parallelShearStrength"] = materialAsset.WoodParallelShearStrength;
-          timberMaterial["perpendicularCompressionStrength"] = materialAsset.WoodPerpendicularCompressionStrength;
-          timberMaterial["perpendicularShearStrength"] = materialAsset.WoodPerpendicularShearStrength;
+
+          if (materialAsset != null)
+          {
+            timberMaterial.grade = materialAsset.WoodGrade;
+            timberMaterial.elasticModulus = materialAsset.YoungModulus.X; // Newtons per foot meter 
+            timberMaterial.poissonsRatio = materialAsset.PoissonRatio.X;
+            timberMaterial.shearModulus = materialAsset.ShearModulus.X; // Newtons per foot meter
+            timberMaterial.density = materialAsset.Density; // kilograms per cubed feet 
+            timberMaterial.thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X; // inverse Kelvin
+            timberMaterial.species = materialAsset.WoodSpecies;
+            timberMaterial["bendingStrength"] = materialAsset.WoodBendingStrength;
+            timberMaterial["parallelCompressionStrength"] = materialAsset.WoodParallelCompressionStrength;
+            timberMaterial["parallelShearStrength"] = materialAsset.WoodParallelShearStrength;
+            timberMaterial["perpendicularCompressionStrength"] = materialAsset.WoodPerpendicularCompressionStrength;
+            timberMaterial["perpendicularShearStrength"] = materialAsset.WoodPerpendicularShearStrength;
+          }
+
           speckleMaterial = timberMaterial;
           break;
         default:
@@ -589,5 +614,43 @@ private StructuralMaterial GetStructuralMaterial(StructuralMaterialType material
 
       return speckleMaterial;
     }
+
+    private StructuralMaterialType GetMaterialType(string materialName)
+    {
+      StructuralMaterialType materialType = StructuralMaterialType.Undefined;
+      switch (materialName.ToLower())
+      {
+        case "concrete":
+          materialType = StructuralMaterialType.Concrete;
+          break;
+        case "steel":
+          materialType = StructuralMaterialType.Steel;
+          break;
+        case "wood":
+          materialType = StructuralMaterialType.Wood;
+          break;
+      }
+
+      return materialType;
+    }
+
+    private StructuralMaterialType GetMaterialType(StructuralAsset materialAsset)
+    {
+      StructuralMaterialType materialType = StructuralMaterialType.Undefined;
+      switch (materialAsset?.StructuralAssetClass)
+      {
+        case StructuralAssetClass.Metal:
+          materialType = StructuralMaterialType.Steel;
+          break;
+        case StructuralAssetClass.Concrete:
+          materialType = StructuralMaterialType.Concrete;
+          break;
+        case StructuralAssetClass.Wood:
+          materialType = StructuralMaterialType.Wood;
+          break;
+      }
+
+      return materialType;
+    }
   }
 }
\ No newline at end of file
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertAnalyticalSurface.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertAnalyticalSurface.cs
index 582858f82f..eb1d05a8e5 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertAnalyticalSurface.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertAnalyticalSurface.cs	
@@ -158,89 +158,10 @@ private Element2D AnalyticalSurfaceToSpeckle(AnalyticalModelSurface revitSurface
         memberType = MemberType2D.Wall;
       }
 
-      var materialAsset = ((PropertySetElement)structMaterial.Document.GetElement(structMaterial.StructuralAssetId)).GetStructuralAsset();
-      var materialType = structMaterial.MaterialClass;
-
-      Structural.Materials.StructuralMaterial speckleMaterial = null;
-      switch (materialType)
-      {
-        case "Concrete":
-          var concreteMaterial = new Concrete
-          {
-            name = structMaterial.Document.GetElement(structMaterial.StructuralAssetId).Name,
-            materialType = Structural.MaterialType.Concrete,
-            grade = null,
-            designCode = null,
-            codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X,
-            compressiveStrength = materialAsset.ConcreteCompression,
-            tensileStrength = 0,
-            flexuralStrength = 0,
-            maxCompressiveStrain = 0,
-            maxTensileStrain = 0,
-            maxAggregateSize = 0,
-            lightweight = materialAsset.Lightweight,
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X,
-            density = materialAsset.Density,
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X,
-            dampingRatio = 0
-          };
-          speckleMaterial = concreteMaterial;
-          break;
-        case "Steel":
-          var steelMaterial = new Steel
-          {
-            name = structMaterial.Document.GetElement(structMaterial.StructuralAssetId).Name,
-            materialType = Structural.MaterialType.Steel,
-            grade = materialAsset.Name,
-            designCode = null,
-            codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X, // Newtons per foot meter 
-            yieldStrength = materialAsset.MinimumYieldStress, // Newtons per foot meter
-            ultimateStrength = materialAsset.MinimumTensileStrength, // Newtons per foot meter
-            maxStrain = 0,
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X, // Newtons per foot meter
-            density = materialAsset.Density, // kilograms per cubed feet 
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X, // inverse Kelvin
-            dampingRatio = 0
-          };
-          speckleMaterial = steelMaterial;
-          break;
-        case "Wood":
-          var timberMaterial = new Timber
-          {
-            name = structMaterial.Document.GetElement(structMaterial.StructuralAssetId).Name,
-            materialType = Structural.MaterialType.Timber,
-            grade = materialAsset.WoodGrade,
-            designCode = null,
-            codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X, // Newtons per foot meter 
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X, // Newtons per foot meter
-            density = materialAsset.Density, // kilograms per cubed feet 
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X, // inverse Kelvin
-            species = materialAsset.WoodSpecies,
-            dampingRatio = 0
-          };
-          timberMaterial["bendingStrength"] = materialAsset.WoodBendingStrength;
-          timberMaterial["parallelCompressionStrength"] = materialAsset.WoodParallelCompressionStrength;
-          timberMaterial["parallelShearStrength"] = materialAsset.WoodParallelShearStrength;
-          timberMaterial["perpendicularCompressionStrength"] = materialAsset.WoodPerpendicularCompressionStrength;
-          timberMaterial["perpendicularShearStrength"] = materialAsset.WoodPerpendicularShearStrength;
-          speckleMaterial = timberMaterial;
-          break;
-        default:
-          var defaultMaterial = new Structural.Materials.StructuralMaterial
-          {
-            name = structMaterial.Document.GetElement(structMaterial.StructuralAssetId).Name
-          };
-          speckleMaterial = defaultMaterial;
-          break;
-      }
+      var speckleMaterial = GetStructuralMaterial(structMaterial);
 
       prop.material = speckleMaterial;
+
       prop.name = revitSurface.Document.GetElement(revitSurface.GetElementId()).Name;
       //prop.type = memberType;
       //prop.analysisType = Structural.AnalysisType2D.Shell;
@@ -323,89 +244,9 @@ private Element2D AnalyticalSurfaceToSpeckle(AnalyticalPanel revitSurface)
         memberType = MemberType2D.Wall;
       }
 
-      var materialAsset = ((PropertySetElement)structMaterial.Document.GetElement(structMaterial.StructuralAssetId)).GetStructuralAsset();
-      var materialType = structMaterial.MaterialClass;
-
-      Structural.Materials.StructuralMaterial speckleMaterial = null;
-      switch (materialType)
-      {
-        case "Concrete":
-          var concreteMaterial = new Concrete
-          {
-            name = structMaterial.Document.GetElement(structMaterial.StructuralAssetId).Name,
-            materialType = Structural.MaterialType.Concrete,
-            grade = null,
-            designCode = null,
-            codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X,
-            compressiveStrength = materialAsset.ConcreteCompression,
-            tensileStrength = 0,
-            flexuralStrength = 0,
-            maxCompressiveStrain = 0,
-            maxTensileStrain = 0,
-            maxAggregateSize = 0,
-            lightweight = materialAsset.Lightweight,
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X,
-            density = materialAsset.Density,
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X,
-            dampingRatio = 0
-          };
-          speckleMaterial = concreteMaterial;
-          break;
-        case "Steel":
-          var steelMaterial = new Steel
-          {
-            name = structMaterial.Document.GetElement(structMaterial.StructuralAssetId).Name,
-            materialType = Structural.MaterialType.Steel,
-            grade = materialAsset.Name,
-            designCode = null,
-            codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X, // Newtons per foot meter 
-            yieldStrength = materialAsset.MinimumYieldStress, // Newtons per foot meter
-            ultimateStrength = materialAsset.MinimumTensileStrength, // Newtons per foot meter
-            maxStrain = 0,
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X, // Newtons per foot meter
-            density = materialAsset.Density, // kilograms per cubed feet 
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X, // inverse Kelvin
-            dampingRatio = 0
-          };
-          speckleMaterial = steelMaterial;
-          break;
-        case "Wood":
-          var timberMaterial = new Timber
-          {
-            name = structMaterial.Document.GetElement(structMaterial.StructuralAssetId).Name,
-            materialType = Structural.MaterialType.Timber,
-            grade = materialAsset.WoodGrade,
-            designCode = null,
-            codeYear = null,
-            elasticModulus = materialAsset.YoungModulus.X, // Newtons per foot meter 
-            poissonsRatio = materialAsset.PoissonRatio.X,
-            shearModulus = materialAsset.ShearModulus.X, // Newtons per foot meter
-            density = materialAsset.Density, // kilograms per cubed feet 
-            thermalExpansivity = materialAsset.ThermalExpansionCoefficient.X, // inverse Kelvin
-            species = materialAsset.WoodSpecies,
-            dampingRatio = 0
-          };
-          timberMaterial["bendingStrength"] = materialAsset.WoodBendingStrength;
-          timberMaterial["parallelCompressionStrength"] = materialAsset.WoodParallelCompressionStrength;
-          timberMaterial["parallelShearStrength"] = materialAsset.WoodParallelShearStrength;
-          timberMaterial["perpendicularCompressionStrength"] = materialAsset.WoodPerpendicularCompressionStrength;
-          timberMaterial["perpendicularShearStrength"] = materialAsset.WoodPerpendicularShearStrength;
-          speckleMaterial = timberMaterial;
-          break;
-        default:
-          var defaultMaterial = new Structural.Materials.StructuralMaterial
-          {
-            name = structMaterial.Document.GetElement(structMaterial.StructuralAssetId).Name
-          };
-          speckleMaterial = defaultMaterial;
-          break;
-      }
-
+      var speckleMaterial = GetStructuralMaterial(structMaterial);
       prop.material = speckleMaterial;
+
       prop.name = structuralElement.Name;
       //prop.type = memberType;
       //prop.analysisType = Structural.AnalysisType2D.Shell;
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertBeam.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertBeam.cs
index 02ae73fe67..bedcae7547 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertBeam.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertBeam.cs	
@@ -1,5 +1,6 @@
-using Autodesk.Revit.DB;
+using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Structure;
+using Autodesk.Revit.DB.Visual;
 using Objects.BuiltElements;
 using Objects.BuiltElements.Revit;
 using Speckle.Core.Models;
@@ -18,9 +19,9 @@ public ApplicationObject BeamToNative(Beam speckleBeam, StructuralType structura
     {
       var docObj = GetExistingElementByApplicationId(speckleBeam.applicationId);
       var appObj = new ApplicationObject(speckleBeam.id, speckleBeam.speckle_type) { applicationId = speckleBeam.applicationId };
-      
+
       // skip if element already exists in doc & receive mode is set to ignore
-      if (IsIgnore(docObj, appObj, out appObj)) 
+      if (IsIgnore(docObj, appObj, out appObj))
         return appObj;
 
       if (speckleBeam.baseLine == null)
@@ -81,7 +82,8 @@ public ApplicationObject BeamToNative(Beam speckleBeam, StructuralType structura
         revitBeam = Doc.Create.NewFamilyInstance(baseLine, familySymbol, level, structuralType);
         // check for disallow join for beams in user settings
         // currently, this setting only applies to beams being created
-        if (Settings.ContainsKey("disallow-join"))
+
+        if (Settings.ContainsKey("disallow-join") && !string.IsNullOrEmpty(Settings["disallow-join"]))
         {
           List<string> joinSettings = new List<string>(Regex.Split(Settings["disallow-join"], @"\,\ "));
           if (joinSettings.Contains(StructuralFraming))
@@ -101,6 +103,7 @@ public ApplicationObject BeamToNative(Beam speckleBeam, StructuralType structura
       // TODO: get sub families, it's a family! 
       var state = isUpdate ? ApplicationObject.State.Updated : ApplicationObject.State.Created;
       appObj.Update(status: state, createdId: revitBeam.UniqueId, convertedItem: revitBeam);
+      appObj = SetHostedElements(speckleBeam, revitBeam, appObj);
       return appObj;
     }
 
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertColumn.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertColumn.cs
index ec66ae57de..75e22d70bf 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertColumn.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertColumn.cs	
@@ -155,6 +155,7 @@ public ApplicationObject ColumnToNative(Column speckleColumn)
       var state = isUpdate ? ApplicationObject.State.Updated : ApplicationObject.State.Created;
       appObj.Update(status: state, createdId: revitColumn.UniqueId, convertedItem: revitColumn);
       // TODO: nested elements.
+      appObj = SetHostedElements(speckleColumn, revitColumn, appObj);
       return appObj;
     }
 
@@ -224,7 +225,10 @@ public Base ColumnToSpeckle(DB.FamilyInstance revitColumn, out List<string> note
       //make line from point and height
       if (baseLine == null && baseGeometry is Point basePoint)
       {
-        var elevation = ConvertAndCacheLevel(revitColumn, BuiltInParameter.FAMILY_TOP_LEVEL_PARAM).elevation;
+        if (symbol.Family.FamilyPlacementType == FamilyPlacementType.OneLevelBased)
+          return PointBasedFamilyInstanceToSpeckle(revitColumn, basePoint, out notes);
+
+        var elevation = speckleColumn.topLevel.elevation;
         baseLine = new Line(basePoint, new Point(basePoint.x, basePoint.y, elevation + speckleColumn.topOffset, ModelUnits), ModelUnits);
       }
 
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertConduit.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertConduit.cs
new file mode 100644
index 0000000000..1af601e28b
--- /dev/null
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertConduit.cs	
@@ -0,0 +1,93 @@
+using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.Electrical;
+using Objects.BuiltElements.Revit;
+using Speckle.Core.Models;
+using System.Collections.Generic;
+using DB = Autodesk.Revit.DB;
+using Line = Objects.Geometry.Line;
+
+namespace Objects.Converter.Revit
+{
+  public partial class ConverterRevit
+  {
+    public ApplicationObject ConduitToNative(BuiltElements.Conduit speckleConduit)
+    {
+      var speckleRevitConduit = speckleConduit as RevitConduit;
+
+      var docObj = GetExistingElementByApplicationId(speckleConduit.applicationId);
+      var appObj = new ApplicationObject(speckleConduit.id, speckleConduit.speckle_type) { applicationId = speckleConduit.applicationId };
+      if (docObj != null && ReceiveMode == Speckle.Core.Kits.ReceiveMode.Ignore)
+      {
+        appObj.Update(status: ApplicationObject.State.Skipped, createdId: docObj.UniqueId, convertedItem: docObj);
+        return appObj;
+      }
+
+      if (!(speckleConduit.baseCurve is Line))
+      {
+        appObj.Update(status: ApplicationObject.State.Failed, logItem: $"BaseCurve of type ${speckleConduit.baseCurve.GetType()} cannot be used to create a Revit Conduit");
+        return appObj;
+      }
+
+      if (!GetElementType(speckleConduit, appObj, out ConduitType conduitType))
+      {
+        appObj.Update(status: ApplicationObject.State.Failed, logItem: $"Could not retrieve conduit type");
+        return appObj;
+      }
+
+      DB.Line baseLine = LineToNative(speckleConduit.baseCurve as Line);
+      XYZ startPoint = baseLine.GetEndPoint(0);
+      XYZ endPoint = baseLine.GetEndPoint(1);
+      DB.Level lineLevel = ConvertLevelToRevit(speckleRevitConduit != null ? speckleRevitConduit.level : LevelFromCurve(baseLine), out ApplicationObject.State levelState);
+      var conduit = Conduit.Create(Doc, conduitType.Id, startPoint, endPoint, lineLevel.Id);
+
+      if (conduit == null)
+      {
+        appObj.Update(status: ApplicationObject.State.Failed, logItem: $"Creation returned null");
+        return appObj;
+      }
+
+      // deleting instead of updating for now!
+      if (docObj != null)
+        Doc.Delete(docObj.Id);
+
+      if (speckleRevitConduit != null)
+      {
+        TrySetParam(conduit, BuiltInParameter.RBS_CONDUIT_DIAMETER_PARAM, speckleRevitConduit.diameter, speckleRevitConduit.units);
+        TrySetParam(conduit, BuiltInParameter.CURVE_ELEM_LENGTH, speckleRevitConduit.length, speckleRevitConduit.units);
+        SetInstanceParameters(conduit, speckleRevitConduit);
+      }
+
+      appObj.Update(status: ApplicationObject.State.Created, createdId: conduit.UniqueId, convertedItem: conduit);
+      return appObj;
+    }
+
+    public BuiltElements.Conduit ConduitToSpeckle(Conduit revitConduit)
+    {
+      var baseGeometry = LocationToSpeckle(revitConduit);
+      if (!(baseGeometry is Line baseLine))
+        throw new Speckle.Core.Logging.SpeckleException("Only line based Conduits are currently supported.");
+
+      var conduitType = revitConduit.Document.GetElement(revitConduit.GetTypeId()) as ConduitType;
+
+      // SPECKLE CONDUIT
+      var speckleConduit = new RevitConduit
+      {
+        family = conduitType.FamilyName,
+        type = conduitType.Name,
+        baseCurve = baseLine,
+        diameter = GetParamValue<double>(revitConduit, BuiltInParameter.RBS_CONDUIT_DIAMETER_PARAM),
+        length = GetParamValue<double>(revitConduit, BuiltInParameter.CURVE_ELEM_LENGTH),
+        level = ConvertAndCacheLevel(revitConduit, BuiltInParameter.RBS_START_LEVEL_PARAM),
+        displayValue = GetElementMesh(revitConduit)
+      };
+
+      GetAllRevitParamsAndIds(speckleConduit, revitConduit,
+        new List<string>
+        {
+          "RBS_CONDUIT_DIAMETER_PARAM", "CURVE_ELEM_LENGTH", "RBS_START_LEVEL_PARAM"
+        });
+
+      return speckleConduit;
+    }
+  }
+}
\ No newline at end of file
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertDirectShape.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertDirectShape.cs
index fc8edfd74c..55403d8127 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertDirectShape.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertDirectShape.cs	
@@ -94,6 +94,8 @@ public ApplicationObject DirectShapeToNative(DirectShape speckleDs, ToNativeMesh
       });
 
       BuiltInCategory bic;
+      if ((int)speckleDs.category == -1)
+        speckleDs.category = RevitCategory.GenericModels;
       var bicName = Categories.GetBuiltInFromSchemaBuilderCategory(speckleDs.category);
 
       BuiltInCategory.TryParse(bicName, out bic);
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFabricationPart.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFabricationPart.cs
new file mode 100644
index 0000000000..5ef5fab7ee
--- /dev/null
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFabricationPart.cs	
@@ -0,0 +1,20 @@
+using Autodesk.Revit.DB;
+using Objects.BuiltElements.Revit;
+using System.Collections.Generic;
+
+namespace Objects.Converter.Revit
+{
+  public partial class ConverterRevit
+  {
+    /// <summary>
+    /// Convert fabrication parts to speckle elements
+    /// </summary>
+    /// <param name="revitElement">Fabrication part in Revit</param>
+    /// <param name="notes">Conversion notes for the exceptional cases</param>
+    /// <returns>RevitElement which represents converted fabrication part as speckle object</returns>
+    public RevitElement FabricationPartToSpeckle(FabricationPart revitElement, out List<string> notes)
+    {
+      return RevitElementToSpeckle(revitElement, out notes);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFamilyInstance.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFamilyInstance.cs
index 27898a0982..b9d24845a8 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFamilyInstance.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFamilyInstance.cs	
@@ -103,46 +103,17 @@ public ApplicationObject FamilyInstanceToNative(BuiltElements.Revit.FamilyInstan
               appObj.Update(status: ApplicationObject.State.Failed, logItem: $"Object is work plane based but does not have a host element");
               return appObj;
             }
-            if (CurrentHostElement is Wall wall)
+            if (CurrentHostElement is Element el)
             {
               Doc.Regenerate();
 
               Options op = new Options();
               op.ComputeReferences = true;
-              GeometryElement wallGeom = wall.get_Geometry(op);
+              GeometryElement geomElement = el.get_Geometry(op);
               Reference faceRef = null;
+              var planeDist = double.MaxValue;
 
-              foreach (var geom in wallGeom)
-              {
-                if (geom is Solid solid)
-                {
-                  FaceArray faceArray = solid.Faces;
-
-                  double planeDist = double.PositiveInfinity;
-                  foreach (Face face in faceArray)
-                  {
-                    if (face is PlanarFace planarFace)
-                    {
-                      // some family instance base points may lie on the intersection of faces
-                      // this makes it so family instance families can only be placed on the
-                      // faces of walls
-                      if (NormalsAlign(planarFace.FaceNormal, wall.Orientation))
-                      {
-                        double newPlaneDist = ComputePlaneDistance(planarFace.Origin, planarFace.FaceNormal, basePoint);
-                        if (newPlaneDist < planeDist)
-                        {
-                          planeDist = newPlaneDist;
-                          faceRef = planarFace.Reference;
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-
-              // last resort, just guess a face
-              if (faceRef == null)
-                faceRef = HostObjectUtils.GetSideFaces(wall, ShellLayerType.Interior)[0];
+              GetReferencePlane(geomElement, basePoint, ref faceRef, ref planeDist);
 
               XYZ norm = new XYZ(0, 0, 0);
               familyInstance = Doc.Create.NewFamilyInstance(faceRef, basePoint, norm, familySymbol);
@@ -152,7 +123,7 @@ public ApplicationObject FamilyInstanceToNative(BuiltElements.Revit.FamilyInstan
               IList<Parameter> lvlParams = familyInstance.GetParameters("Schedule Level");
 
               if (cutVoidsParams.ElementAtOrDefault(0) != null && cutVoidsParams[0].AsInteger() == 1)
-                InstanceVoidCutUtils.AddInstanceVoidCut(Doc, wall, familyInstance);
+                InstanceVoidCutUtils.AddInstanceVoidCut(Doc, el, familyInstance);
               if (lvlParams.ElementAtOrDefault(0) != null)
                 lvlParams[0].Set(level.Id);
             }
@@ -163,6 +134,25 @@ public ApplicationObject FamilyInstanceToNative(BuiltElements.Revit.FamilyInstan
               return appObj;
             }
           }
+          else if (familySymbol.Family.FamilyPlacementType == FamilyPlacementType.OneLevelBased)
+          {
+            if (CurrentHostElement is FootPrintRoof roof)
+            {
+              // handle receiving mullions on a curtain roof
+              var curtainGrids = roof.CurtainGrids;
+              CurtainGrid lastGrid = null;
+              foreach (var curtainGrid in curtainGrids)
+                if (curtainGrid is CurtainGrid c)
+                  lastGrid = c;
+
+              if (lastGrid != null && speckleFi["isUGridLine"] is bool isUGridLine)
+              {
+                var gridLine = lastGrid.AddGridLine(isUGridLine, basePoint, false);
+                foreach (var seg in gridLine.AllSegmentCurves)
+                  gridLine.AddMullions(seg as Curve, familySymbol as MullionType, isUGridLine);
+              }
+            }
+          }
           else
           {
             appObj.Update(status: ApplicationObject.State.Failed, logItem: $"Unsupported FamilyPlacementType {familySymbol.Family.FamilyPlacementType}");
@@ -213,6 +203,41 @@ public ApplicationObject FamilyInstanceToNative(BuiltElements.Revit.FamilyInstan
       return appObj;
     }
 
+    private void GetReferencePlane(GeometryElement geomElement, XYZ basePoint, ref Reference faceRef, ref double planeDist)
+    {
+      foreach (var geom in geomElement)
+      {
+        if (geom is Solid solid)
+        {
+          FaceArray faceArray = solid.Faces;
+
+          foreach (Face face in faceArray)
+          {
+            if (face is PlanarFace planarFace)
+            {
+              // some family instance base points may lie on the intersection of faces
+              // this makes it so family instance families can only be placed on the
+              // faces of walls
+              //if (NormalsAlign(planarFace.FaceNormal, wall.Orientation))
+              //{
+              double newPlaneDist = ComputePlaneDistance(planarFace.Origin, planarFace.FaceNormal, basePoint);
+              if (newPlaneDist < planeDist)
+              {
+                planeDist = newPlaneDist;
+                faceRef = planarFace.Reference;
+              }
+              //}
+            }
+          }
+        }
+        else if (geom is GeometryInstance geomInst)
+        {
+          GeometryElement transformedGeom = geomInst.GetInstanceGeometry(geomInst.Transform);
+          GetReferencePlane(transformedGeom, basePoint, ref faceRef, ref planeDist);
+        }
+      }
+    }
+
     /// <summary>
     /// Entry point for all revit family conversions.
     /// </summary>
@@ -221,42 +246,70 @@ public ApplicationObject FamilyInstanceToNative(BuiltElements.Revit.FamilyInstan
     public Base FamilyInstanceToSpeckle(DB.FamilyInstance revitFi, out List<string> notes)
     {
       notes = new List<string>();
-      if (!ShouldConvertHostedElement(revitFi, revitFi.Host))
+      Base @base = null;
+      Base extraProps = new Base();
+
+      if (!ShouldConvertHostedElement(revitFi, revitFi.Host, ref extraProps))
         return null;
 
       //adaptive components
       if (AdaptiveComponentInstanceUtils.IsAdaptiveComponentInstance(revitFi))
-        return AdaptiveComponentToSpeckle(revitFi);
+        @base = AdaptiveComponentToSpeckle(revitFi);
 
       //these elements come when the curtain wall is generated
-      //let's not send them to speckle unless we realize they are needed!
-      if (Categories.curtainWallSubElements.Contains(revitFi.Category))
+      //if they are contained in 'subelements' then they have already been accounted for from a wall
+      //else if they are mullions then convert them as a generic family instance but add a isUGridLine prop
+      if (@base == null && Categories.curtainWallSubElements.Contains(revitFi.Category))
       {
         if (SubelementIds.Contains(revitFi.Id))
           return null;
+        else if (Categories.Contains(new List<BuiltInCategory> { BuiltInCategory.OST_CurtainWallMullions }, revitFi.Category))
+        {
+          var direction = ((DB.Line)((Mullion)revitFi).LocationCurve).Direction;
+          // TODO: add support for more severly sloped mullions. This isn't very robust at the moment
+          extraProps["isUGridLine"] = Math.Abs(direction.X) > Math.Abs(direction.Y) ? true : false;
+        }
         else
           //TODO: sort these so we consistently get sub-elements from the wall element in case also sub-elements are sent
           SubelementIds.Add(revitFi.Id);
       }
 
       //beams & braces
-      if (Categories.beamCategories.Contains(revitFi.Category))
+      if (@base == null && Categories.beamCategories.Contains(revitFi.Category))
       {
         if (revitFi.StructuralType == StructuralType.Beam)
-          return BeamToSpeckle(revitFi, out notes);
+          @base = BeamToSpeckle(revitFi, out notes);
         else if (revitFi.StructuralType == StructuralType.Brace)
-          return BraceToSpeckle(revitFi, out notes);
+          @base = BraceToSpeckle(revitFi, out notes);
       }
 
       //columns
-      if (Categories.columnCategories.Contains(revitFi.Category) || revitFi.StructuralType == StructuralType.Column)
-        return ColumnToSpeckle(revitFi, out notes);
+      if (@base == null && Categories.columnCategories.Contains(revitFi.Category) || revitFi.StructuralType == StructuralType.Column)
+        @base = ColumnToSpeckle(revitFi, out notes);
 
       var baseGeometry = LocationToSpeckle(revitFi);
       var basePoint = baseGeometry as Point;
-      if (basePoint == null)
-        return RevitElementToSpeckle(revitFi, out notes);
+      if (@base == null && basePoint == null)
+        @base = RevitElementToSpeckle(revitFi, out notes);
+
+      if (@base == null)
+        @base = PointBasedFamilyInstanceToSpeckle(revitFi, basePoint, out notes);
 
+      // add additional props to base object
+      foreach (var prop in extraProps.GetDynamicMembers())
+        @base[prop] = extraProps[prop];
+
+      return @base; 
+    }
+
+    /// <summary>
+    /// Converts point-based family instances.
+    /// </summary>
+    /// <param name="revitFi"></param>
+    /// <returns></returns>
+    private Base PointBasedFamilyInstanceToSpeckle(DB.FamilyInstance revitFi, Point basePoint, out List<string> notes)
+    {
+      notes = new List<string>();
       var lev1 = ConvertAndCacheLevel(revitFi, BuiltInParameter.FAMILY_LEVEL_PARAM);
       var lev2 = ConvertAndCacheLevel(revitFi, BuiltInParameter.FAMILY_BASE_LEVEL_PARAM);
 
@@ -275,7 +328,7 @@ public Base FamilyInstanceToSpeckle(DB.FamilyInstance revitFi, out List<string>
       if (revitFi.Location is LocationPoint)
         speckleFi.rotation = ((LocationPoint)revitFi.Location).Rotation;
 
-      speckleFi.displayValue = GetElementMesh(revitFi, GetAllFamSubElements(revitFi));
+      speckleFi.displayValue = GetElementMesh(revitFi);
 
       var material = ConverterRevit.GetMEPSystemMaterial(revitFi);
 
@@ -312,8 +365,6 @@ public Base FamilyInstanceToSpeckle(DB.FamilyInstance revitFi, out List<string>
 
 #endregion
 
-      // TODO:
-      // revitFi.GetSubelements();
       return speckleFi;
     }
 
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFloor.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFloor.cs
index 7b435e9451..f17eaf99f0 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFloor.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertFloor.cs	
@@ -57,13 +57,13 @@ public ApplicationObject FloorToNative(BuiltElements.Floor speckleFloor)
       // NOTE: I have not found a way to edit a slab outline properly, so whenever we bake, we renew the element. The closest thing would be:
       // https://adndevbConversionLog.Add.typepad.com/aec/2013/10/change-the-boundary-of-floorsslabs.html
       // This would only work if the floors have the same number (and type!!!) of outline curves. 
-      
+
 
       if (docObj != null)
         Doc.Delete(docObj.Id);
 
       DB.Floor revitFloor = null;
-#if (REVIT2019 || REVIT2020 || REVIT2021)
+#if (REVIT2020 || REVIT2021)
       if (floorType == null)
       {
         if (slope != 0 && slopeDirection != null)
@@ -80,20 +80,20 @@ public ApplicationObject FloorToNative(BuiltElements.Floor speckleFloor)
       }
 
 #else
-     if (floorType == null)
+      if (floorType == null)
         throw new SpeckleException("Floor needs a floor type");
 
       else
       {
         //from revit 2022 we can create openings in the floors!
         var profile = new List<CurveLoop> { CurveArrayToCurveLoop(outline) };
-        if(speckleFloor["voids"] != null && (speckleFloor["voids"] is List<ICurve> voids))
+        if (speckleFloor["voids"] != null && (speckleFloor["voids"] is List<ICurve> voids))
         {
           foreach (var v in voids)
           {
             var opening = CurveArrayToCurveLoop(CurveToNative(v, true));
             profile.Add(opening);
-          }   
+          }
         }
 
         if (slope != 0 && slopeDirection != null)
@@ -105,7 +105,7 @@ public ApplicationObject FloorToNative(BuiltElements.Floor speckleFloor)
 
       Doc.Regenerate();
 
-      #if (REVIT2019 || REVIT2020 || REVIT2021)
+#if (REVIT2020 || REVIT2021)
       try
       {
         CreateVoids(revitFloor, speckleFloor);
@@ -114,7 +114,7 @@ public ApplicationObject FloorToNative(BuiltElements.Floor speckleFloor)
       {
         appObj.Update(logItem: $"Could not create openings: {ex.Message}");
       }
-      #endif
+#endif
 
       SetInstanceParameters(revitFloor, speckleFloor);
 
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertGeometry.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertGeometry.cs
index fe416f5805..0939e0118f 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertGeometry.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertGeometry.cs	
@@ -1,5 +1,6 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.PointClouds;
+using Objects.Converters.DxfConverter;
 using Objects.Geometry;
 using Objects.Other;
 using Objects.Primitive;
@@ -10,7 +11,6 @@
 using System.IO;
 using System.Linq;
 using System.Numerics;
-using Objects.Converters.DxfConverter;
 using Arc = Objects.Geometry.Arc;
 using Curve = Objects.Geometry.Curve;
 using DB = Autodesk.Revit.DB;
@@ -206,7 +206,7 @@ public DB.Arc ArcToNative(Arc arc)
         // Endpoints coincide, it's a circle.
         return DB.Arc.Create(plane, ScaleToNative(arc.radius ?? 0, arc.units), startAngle, endAngle);
       }
-      
+
       return DB.Arc.Create(PointToNative(arc.startPoint), PointToNative(arc.endPoint), PointToNative(arc.midPoint));
       //return Arc.Create( plane.Origin, (double) arc.Radius * Scale, startAngle, endAngle, plane.XVec, plane.YVec );
     }
@@ -389,7 +389,7 @@ public CurveArray CurveToNative(ICurve crv, bool splitIfClosed = false)
 
         case Curve nurbs:
           var n = CurveToNative(nurbs);
-          if(IsCurveClosed(n) && splitIfClosed)
+          if (IsCurveClosed(n) && splitIfClosed)
           {
             var split = SplitCurveInTwoHalves(n);
             curveArray.Append(split.Item1);
@@ -417,7 +417,7 @@ public CurveArray CurveToNative(ICurve crv, bool splitIfClosed = false)
           throw new Speckle.Core.Logging.SpeckleException("The provided geometry is not a valid curve");
       }
     }
-    
+
     //thanks Revit
     public CurveLoop CurveArrayToCurveLoop(CurveArray array)
     {
@@ -497,7 +497,7 @@ public CurveArray PolylineToNative(Polyline polyline)
       {
         // Polyline is actually a single line
         TryAppendLineSafely(
-          curveArray, 
+          curveArray,
           new Line(polyline.value, polyline.units),
           appObj
         );
@@ -509,18 +509,18 @@ public CurveArray PolylineToNative(Polyline polyline)
         for (var i = 1; i < pts.Count; i++)
         {
           var success = TryAppendLineSafely(
-            curveArray, 
-            new Line(lastPt, pts[i] , polyline.units),
+            curveArray,
+            new Line(lastPt, pts[i], polyline.units),
             appObj
           );
-          if(success) lastPt = pts[i];
+          if (success) lastPt = pts[i];
         }
 
         if (polyline.closed)
         {
           TryAppendLineSafely(
-            curveArray, 
-            new Line(pts[pts.Count - 1], pts[0] , polyline.units),
+            curveArray,
+            new Line(pts[pts.Count - 1], pts[0], polyline.units),
             appObj
           );
         }
@@ -606,7 +606,7 @@ public IList<GeometryObject> MeshToNative(Mesh mesh, TessellatedShapeBuilderTarg
       var vertices = ArrayToPoints(mesh.vertices, mesh.units);
 
       ElementId materialId = RenderMaterialToNative(parentMaterial ?? (mesh["renderMaterial"] as RenderMaterial));
-      
+
       int i = 0;
       while (i < mesh.faces.Count)
       {
@@ -791,7 +791,7 @@ public List<BRepBuilderEdgeGeometry> BrepEdgeToNative(BrepEdge edge)
           }
           var halfEdgeA = BRepBuilderEdgeGeometry.Create(first);
           var halfEdgeB = BRepBuilderEdgeGeometry.Create(second);
-          return edge.ProxyCurveIsReversed 
+          return edge.ProxyCurveIsReversed
             ? new List<BRepBuilderEdgeGeometry> { halfEdgeA, halfEdgeB }
             : new List<BRepBuilderEdgeGeometry> { halfEdgeB, halfEdgeA };
         }
@@ -888,7 +888,7 @@ public BRepBuilderSurfaceGeometry SurfaceToNative(Surface surface)
 
       return result;
     }
-    
+
     public Solid BrepToNative(Brep brep, out List<string> notes)
     {
       //Make sure face references are calculated by revit
@@ -916,7 +916,7 @@ public Solid BrepToNative(Brep brep, out List<string> notes)
         {
           var faceId = builder.AddFace(SurfaceToNative(face.Surface), face.OrientationReversed);
           builder.SetFaceMaterialId(faceId, materialId);
-        
+
           foreach (var loop in face.Loops)
           {
             try
@@ -996,7 +996,7 @@ public Solid BrepToNative(Brep brep, out List<string> notes)
 
     public Brep BrepToSpeckle(Solid solid, Document d, string units = null)
     {
-#if REVIT2019 || REVIT2020
+#if REVIT2020
 
       throw new Speckle.Core.Logging.SpeckleException("Converting BREPs to Speckle is currently only supported in Revit 2021 and above.");
 #else
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertMeshUtils.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertMeshUtils.cs
index 07b972e4c4..12897be0e5 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertMeshUtils.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertMeshUtils.cs	
@@ -1,4 +1,4 @@
-using Autodesk.Revit.DB;
+using Autodesk.Revit.DB;
 using Objects.Other;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ namespace Objects.Converter.Revit
 {
   public partial class ConverterRevit
   {
-    public List<Mesh> GetElementMesh(DB.Element element, List<DB.Element> subElements = null)
+    public List<Mesh> GetElementMesh(DB.Element element)
     {
       var allSolids = GetElementSolids(element, opt: new Options() { DetailLevel = ViewDetailLevel.Fine, ComputeReferences = true });
       if (!allSolids.Any()) //it's a mesh!
@@ -19,12 +19,7 @@ public List<Mesh> GetElementMesh(DB.Element element, List<DB.Element> subElement
         return GetMeshes(geom, element.Document);
       }
 
-      if (subElements != null)
-        foreach (var sb in subElements)
-          allSolids.AddRange(GetElementSolids(sb));
-
       return GetMeshesFromSolids(allSolids, element.Document);
-
     }
 
     /// <summary>
@@ -114,6 +109,48 @@ private List<Mesh> GetMeshes(GeometryElement geom, Document d)
       return buildHelper.GetAllValidMeshes();
     }
 
+    /// <summary>
+    /// Get meshes from fabrication parts which have different geometry hierarchy than other revit elements.
+    /// </summary>
+    /// <param name="element"></param>
+    /// <param name="subElements"></param>
+    /// <returns></returns>
+    public List<Mesh> GetFabricationMeshes(Element element, List<Element> subElements = null)
+    {
+      //Search for solids on geometry element level
+      var allSolids = GetElementSolids(element, opt: new Options() { DetailLevel = ViewDetailLevel.Fine, ComputeReferences = true });
+
+      List<Mesh> meshes = new List<Mesh>();
+
+      var geom = element.get_Geometry(new Options());
+      if (geom == null)
+        return null;
+
+      foreach (GeometryInstance instance in geom)
+      {
+        //Get instance geometry from fabrication part geometry
+        var symbolGeometry = instance.GetInstanceGeometry();
+
+        //Get meshes
+        var symbolMeshes = GetMeshes(symbolGeometry, element.Document);
+        meshes.AddRange(symbolMeshes);
+
+        //Get solids
+        var symbolSolids = GetSolids(symbolGeometry);
+        allSolids.AddRange(symbolSolids);
+      }
+
+
+      if (subElements != null)
+        foreach (var sb in subElements)
+          allSolids.AddRange(GetElementSolids(sb));
+
+      //Convert solids to meshes
+      meshes.AddRange(GetMeshesFromSolids(allSolids, element.Document));
+
+      return meshes;
+    }
+
     /// <summary>
     /// Helper class for a single <see cref="Objects.Geometry.Mesh"/> object for each <see cref="DB.Material"/>
     /// </summary>
@@ -239,7 +276,7 @@ public List<Mesh> GetMeshesFromSolids(IEnumerable<Solid> solids, Document d)
         {
           DB.Material faceMaterial = d.GetElement(face.MaterialElementId) as DB.Material;
           Mesh m = meshBuildHelper.GetOrCreateMesh(faceMaterial, ModelUnits);
-          if(!MeshMap.ContainsKey(m))
+          if (!MeshMap.ContainsKey(m))
           {
             MeshMap.Add(m, new List<DB.Mesh>());
           }
@@ -247,7 +284,7 @@ public List<Mesh> GetMeshesFromSolids(IEnumerable<Solid> solids, Document d)
         }
       }
 
-      foreach(var meshData in MeshMap)
+      foreach (var meshData in MeshMap)
       {
         //It's cheaper to resize lists manually, since we would otherwise be resizing a lot!
         int numberOfVertices = 0;
@@ -300,4 +337,4 @@ private void ConvertMeshData(DB.Mesh mesh, List<int> faces, List<double> vertice
     }
 
   }
-}
\ No newline at end of file
+}
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertNetwork.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertNetwork.cs
new file mode 100644
index 0000000000..4fa81a32c2
--- /dev/null
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertNetwork.cs	
@@ -0,0 +1,489 @@
+using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.Electrical;
+using Autodesk.Revit.DB.Mechanical;
+using Autodesk.Revit.DB.Plumbing;
+using Speckle.Core.Credentials;
+using Speckle.Core.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using DB = Autodesk.Revit.DB;
+using Network = Objects.BuiltElements.Network;
+using NetworkElement = Objects.BuiltElements.NetworkElement;
+using NetworkLink = Objects.BuiltElements.NetworkLink;
+using RevitNetworkElement = Objects.BuiltElements.Revit.RevitNetworkElement;
+using RevitNetworkLink = Objects.BuiltElements.Revit.RevitNetworkLink;
+using Objects.BuiltElements.Revit;
+using ConverterRevitShared.Revit;
+using Speckle.Newtonsoft.Json.Linq;
+
+namespace Objects.Converter.Revit
+{
+  public partial class ConverterRevit
+  {
+    public ApplicationObject NetworkToNative(Network speckleNetwork)
+    {
+      var appObj = new ApplicationObject(speckleNetwork.id, speckleNetwork.speckle_type) { applicationId = speckleNetwork.applicationId };
+
+      speckleNetwork.elements.ForEach(e => e.network = speckleNetwork);
+      speckleNetwork.links.ForEach(l => l.network = speckleNetwork);
+
+      // convert all the MEP trades and family instances except fittings
+
+      var convertedElements = new Dictionary<string, Element>();
+      var elements = speckleNetwork.elements.Cast<RevitNetworkElement>().ToList();
+      var notConnectorBasedCreationElements = elements.Where(e => !e.isConnectorBased).ToArray();
+      foreach (var networkElement in notConnectorBasedCreationElements)
+      {
+        var element = networkElement.elements;
+        if (CanConvertToNative(element))
+        {
+          var convAppObj = ConvertToNative(element) as ApplicationObject;
+          foreach (var obj in convAppObj.Converted)
+          {
+            var nativeElement = obj as Element;
+            appObj.Update(status: ApplicationObject.State.Created, createdId: nativeElement.UniqueId, convertedItem: nativeElement);
+          }
+          convertedElements.Add(networkElement.applicationId, convAppObj.Converted.First() as Element);
+        }
+        else
+        {
+          appObj.Update(status: ApplicationObject.State.Skipped, logItem: $"Receiving this object type is not supported in Revit");
+        }
+      }
+
+      // convert connector based creation elements, We use different way to create curve fittings such as elbow,
+      // transition, tee, union, cross then other family instances since creation are based on connectors, two,
+      // three or four depends on type of fitting.
+
+      var connectorBasedCreationElements = elements.Where(e => e.isConnectorBased).ToArray();
+      var convertedMEPCurves = convertedElements.Where(e => e.Value is MEPCurve).ToArray();
+      foreach (var networkElement in connectorBasedCreationElements)
+      {
+        if (!GetElementType(networkElement.elements, appObj, out FamilySymbol familySymbol))
+        {
+          appObj.Update(status: ApplicationObject.State.Failed);
+          continue;
+        }
+        
+        DB.FamilyInstance familyInstance = null;
+
+        var tempCurves = new Dictionary<int, MEPCurve>();
+
+        foreach (var link in networkElement.links)
+        {
+          if (link is RevitNetworkLink revitLink && revitLink.needsPlaceholders)
+          {
+            var curve = CreateCurve(revitLink);
+            tempCurves.Add(revitLink.fittingIndex, curve);
+          }
+        }
+
+        var connections = networkElement.links.Cast<RevitNetworkLink>().ToDictionary(
+          l => l,
+          l => l.elements
+          .Cast<RevitNetworkElement>()
+          .FirstOrDefault(e => e.applicationId != networkElement.applicationId
+          && e.isCurveBased));
+
+        var connection1 = connections.FirstOrDefault(c => c.Key.fittingIndex == 1);
+        var connection2 = connections.FirstOrDefault(c => c.Key.fittingIndex == 2);
+        var connection3 = connections.FirstOrDefault(c => c.Key.fittingIndex == 3);
+        var connection4 = connections.FirstOrDefault(c => c.Key.fittingIndex == 4);
+
+        var element1 = connection1.Value != null ? convertedMEPCurves.FirstOrDefault(e => e.Key == connection1.Value.applicationId).Value : tempCurves.FirstOrDefault(t => t.Key == 1).Value;
+        var element2 = connection2.Value != null ? convertedMEPCurves.FirstOrDefault(e => e.Key == connection2.Value.applicationId).Value : tempCurves.FirstOrDefault(t => t.Key == 2).Value;
+        var element3 = connection3.Value != null ? convertedMEPCurves.FirstOrDefault(e => e.Key == connection3.Value.applicationId).Value : tempCurves.FirstOrDefault(t => t.Key == 3).Value;
+        var element4 = connection4.Value != null ? convertedMEPCurves.FirstOrDefault(e => e.Key == connection4.Value.applicationId).Value : tempCurves.FirstOrDefault(t => t.Key == 4).Value;
+
+        var connector1 = element1 != null ? GetConnectorByPoint(element1, PointToNative(connection1.Key.origin)) : null;
+        var connector2 = element2 != null ? GetConnectorByPoint(element2, PointToNative(connection2.Key.origin)) : null;
+        var connector3 = element3 != null ? GetConnectorByPoint(element3, PointToNative(connection3.Key.origin)) : null;
+        var connector4 = element4 != null ? GetConnectorByPoint(element4, PointToNative(connection4.Key.origin)) : null;
+
+        var partType = networkElement.elements["partType"] as string ?? "Unknown";
+        if (partType.Contains("Elbow") && connector1 != null && connector2 != null)
+          familyInstance = Doc.Create.NewElbowFitting(connector1, connector2);
+        else if (partType.Contains("Transition") && connector1 != null && connector2 != null)
+          familyInstance = Doc.Create.NewTransitionFitting(connector1, connector2);
+        else if (partType.Contains("Union") && connector1 != null && connector2 != null)
+          familyInstance = Doc.Create.NewUnionFitting(connector1, connector2);
+        else if (partType.Contains("Tee") && connector1 != null && connector2 != null && connector3 != null)
+          familyInstance = Doc.Create.NewTeeFitting(connector1, connector2, connector3);
+        else if (partType.Contains("Cross") && connector1 != null && connector2 != null && connector3 != null && connector4 != null)
+          familyInstance = Doc.Create.NewCrossFitting(connector1, connector2, connector3, connector4);
+        else
+        {
+          var convAppObj = ConvertToNative(networkElement.elements) as ApplicationObject;
+          foreach (var obj in convAppObj.Converted)
+          {
+            var nativeElement = obj as Element;
+            appObj.Update(status: ApplicationObject.State.Created, createdId: nativeElement.UniqueId, convertedItem: nativeElement);
+          }
+        }
+
+        if (familyInstance != null)
+        {
+          convertedElements.Add(networkElement.applicationId, familyInstance);
+          familyInstance?.ChangeTypeId(familySymbol.Id);
+          Doc.Delete(tempCurves.Select(c => c.Value.Id).ToList());
+
+          appObj.Update(status: ApplicationObject.State.Created, createdId: familyInstance.UniqueId, convertedItem: familyInstance);
+        }
+        else
+        {
+          appObj.Update(status: ApplicationObject.State.Failed, logItem: "Family instance was null");
+        }
+      }
+
+      // check if all the elements are connected, some connectors may be unconnected
+      // due using of temp curves and until all the ones are created no way to connect
+      // them between each other
+
+      var links = speckleNetwork.links.Cast<RevitNetworkLink>().ToArray();
+      foreach (var link in links)
+      {
+        if (link.isConnected && link.elements.Count == 2)
+        {
+          var firstElement = convertedElements.FirstOrDefault(e => e.Key == link.elements[0].applicationId).Value;
+          var secondElement = convertedElements.FirstOrDefault(e => e.Key == link.elements[1].applicationId).Value;
+          var origin = PointToNative(link.origin);
+          var firstConnector = GetConnectorByPoint(firstElement, origin);
+          var secondConnector = GetConnectorByPoint(secondElement, origin);
+          if (firstConnector != null
+            && secondConnector != null
+            && !firstConnector.IsConnected
+            && !secondConnector.IsConnected)
+          {
+            firstConnector.ConnectTo(secondConnector);
+          }
+        }
+      }
+
+      return appObj;
+    }
+
+    public Network NetworkToSpeckle(Element mepElement, out List<string> notes)
+    {
+      Network speckleNetwork = new Network() { name = mepElement.Name, elements = new List<NetworkElement>(), links = new List<NetworkLink>() };
+
+      GetNetworkElements(speckleNetwork, mepElement, out notes);
+
+      return speckleNetwork;
+    }
+
+    /// <summary>
+    /// Gets the connected element of a MEP element and adds the to a Base object
+    /// </summary>
+    /// <param name="base"></param>
+    /// <param name="mepElement"></param>
+    private void GetNetworkElements(Network @network, Element initialElement, out List<string> notes)
+    {
+      CachedContextObjects = ContextObjects.ToList();
+      notes = new List<string>();
+      var networkConnections = new List<ConnectionPair>();
+      GetNetworkConnections(initialElement, ref networkConnections);
+      var groups = networkConnections.GroupBy(n => n.Owner.UniqueId).ToList();
+
+      foreach (var group in groups)
+      {
+        var element = Doc.GetElement(group.Key);
+        var elementIndex = ContextObjects.FindIndex(obj => obj.applicationId == element.UniqueId);
+
+        if (elementIndex != -1)
+          ContextObjects.RemoveAt(elementIndex);
+        else
+          continue;
+
+        ApplicationObject reportObj = Report.GetReportObject(element.UniqueId, out int index) ? Report.ReportObjects[index] : new ApplicationObject(element.UniqueId, element.GetType().ToString());
+
+        Base obj = null;
+        bool connectorBasedCreation = false;
+        switch (element)
+        {
+          case DB.FamilyInstance fi:
+            obj = FamilyInstanceToSpeckle(fi, out notes);
+            // test if this family instance is a fitting
+            var fittingCategories = new List<BuiltInCategory> { BuiltInCategory.OST_PipeFitting, BuiltInCategory.OST_DuctFitting, BuiltInCategory.OST_CableTrayFitting, BuiltInCategory.OST_ConduitFitting };
+            if (fittingCategories.Any(c => (int)c == fi.Category.Id.IntegerValue))
+            {
+              connectorBasedCreation = IsConnectorBasedCreation(fi);
+              var partType = (PartType)fi.Symbol.Family.get_Parameter(BuiltInParameter.FAMILY_CONTENT_PART_TYPE).AsInteger();
+              if (obj != null) obj["partType"] = partType.ToString();
+            }
+            break;
+          case DB.Plumbing.Pipe pipe:
+            obj = PipeToSpeckle(pipe);
+            break;
+          case DB.Plumbing.FlexPipe flexpipe:
+            obj = PipeToSpeckle(flexpipe);
+            break;
+          case DB.Mechanical.Duct duct:
+            obj = DuctToSpeckle(duct, out notes);
+            break;
+          case DB.Mechanical.FlexDuct flexDuct:
+            obj = DuctToSpeckle(flexDuct);
+            break;
+          case DB.Electrical.CableTray cableTray:
+            obj = CableTrayToSpeckle(cableTray);
+            break;
+          case DB.Electrical.Conduit conduit:
+            obj = ConduitToSpeckle(conduit);
+            break;
+          default:
+            reportObj.Update(status: ApplicationObject.State.Skipped, logItem: $"Conversion not supported");
+            Report.Log(reportObj);
+            continue;
+        }
+
+        if (obj == null)
+        {
+          reportObj.Update(status: ApplicationObject.State.Failed, logItem: $"Conversion returned null");
+          Report.Log(reportObj);
+          continue;
+        }
+
+        reportObj.Update(status: ApplicationObject.State.Created, logItem: $"Attached as connected element to {initialElement.UniqueId}");
+        @network.elements.Add(new RevitNetworkElement()
+        {
+          applicationId = element.UniqueId,
+          name = element.Name,
+          elements = obj,
+          linkIndices = new List<int>(),
+          isConnectorBased = connectorBasedCreation,
+          isCurveBased = element is MEPCurve
+        });
+        ConvertedObjectsList.Add(obj.applicationId);
+
+        Report.Log(reportObj);
+      }
+
+      foreach (var group in groups)
+      {
+        var connections = group.ToList();
+        var ownerIndex = @network.elements.FindIndex(e => e.applicationId.Equals(group.Key));
+        var ownerElement = @network.elements[ownerIndex];
+        foreach (var connection in connections)
+        {
+          var link = new RevitNetworkLink() { name = connection.Name, network = @network, elementIndices = new List<int>() };
+
+          link.elementIndices.Add(ownerIndex);
+
+          var connector = connection.Connector;
+
+          link.domain = connector.Domain.ToString();
+          link.shape = connector.Shape.ToString();
+          link.systemName = connector.Owner.Category.Name;
+          link.systemType = connector.MEPSystem != null ? Doc.GetElement(connector.MEPSystem.GetTypeId()).Name : "";
+
+          var origin = connection.Connector.Origin;
+
+          link.origin = PointToSpeckle(origin);
+          link.fittingIndex = connector.Id;
+          link.direction = VectorToSpeckle(connector.CoordinateSystem.BasisZ);
+          link.isConnected = connection.IsConnected;
+          link.needsPlaceholders = connection.ConnectedToCurve(out MEPCurve curve) && IsWithinContext(curve);
+          link.diameter = connection.Diameter;
+          link.height = connection.Height;
+          link.width = connection.Width;
+
+          // find index of the ref element
+          var refConnector = connection.RefConnector;
+          var refIndex = @network.elements.FindIndex(e => e.applicationId.Equals(refConnector?.Owner?.UniqueId));
+
+          // add it in case it exists
+          if (refIndex != -1)
+            link.elementIndices.Add(refIndex);
+
+          @network.links.Add(link);
+          var linkIndex = @network.links.IndexOf(link);
+          ownerElement.linkIndices.Add(linkIndex);
+        }
+      }
+
+      if (@network.elements.Any())
+        notes.Add($"Converted and attached {@network.elements.Count} connected elements");
+    }
+
+    private void GetNetworkConnections(Element element, ref List<ConnectionPair> networkConnections)
+    {
+      var connectionPairs = ConnectionPair.GetConnectionPairs(element);
+      foreach (var connectionPair in connectionPairs)
+      {
+        if (!networkConnections.Contains(connectionPair))
+        {
+          networkConnections.Add(connectionPair);
+          var refElement = connectionPair.RefConnector?.Owner;
+          if (connectionPair.IsConnected && IsWithinContext(refElement))
+            GetNetworkConnections(refElement, ref networkConnections);
+        }
+      }
+    }
+
+    // for fitting family instances, retrieves the type of fitting and determines if it is connector based
+    private bool IsConnectorBasedCreation(DB.FamilyInstance familyInstance)
+    {
+      var connectors = GetConnectors(familyInstance).Cast<Connector>().ToArray();
+      return connectors.All(c => connectors.All(c1 =>
+      (c1.Domain == Domain.DomainPiping && c1.PipeSystemType == c.PipeSystemType) ||
+      (c1.Domain == Domain.DomainHvac && c1.DuctSystemType == c.DuctSystemType) ||
+      (c1.Domain == Domain.DomainElectrical && c1.ElectricalSystemType == c.ElectricalSystemType) ||
+      (c1.Domain == Domain.DomainCableTrayConduit)));
+    }
+
+    private static List<ApplicationObject> CachedContextObjects = null;
+
+    private bool IsWithinContext(Element element)
+    {
+      return CachedContextObjects.Any(obj => obj.applicationId.Equals(element?.UniqueId));
+    }
+
+    private void GetConnectionPairs(Element element, ref List<Tuple<Connector, Connector, Element>> connectionPairs, ref List<Element> elements)
+    {
+      var refss = ConnectionPair.GetConnectionPairs(element);
+
+      foreach (var r in refss)
+      {
+        var isValid = r.IsValid();
+        var isConnected = r.IsConnected;
+      }
+      var refs = GetRefConnectionPairs(element);
+      var refConnectionPairs = GetRefConnectionPairs(element).
+        Where(e => e.Item2 == null || ContextObjects.Any(obj => obj.applicationId.Equals(e.Item2.Owner.UniqueId))).ToList();
+      elements.Add(element);
+      foreach (var refConnectionPair in refs)
+      {
+        var connectedElement = refConnectionPair.Item2?.Owner;
+        if (connectedElement != null
+          && !elements.Any(e => e.UniqueId.Equals(connectedElement.UniqueId))
+          && ContextObjects.Any(obj => obj.applicationId.Equals(connectedElement.UniqueId)))
+        {
+          connectionPairs.Add(Tuple.Create(refConnectionPair.Item1, refConnectionPair.Item2, element));
+          GetConnectionPairs(connectedElement, ref connectionPairs, ref elements);
+        }
+        else
+        {
+          connectionPairs.Add(Tuple.Create<Connector, Connector, Element>(refConnectionPair.Item1, null, element));
+        }
+      }
+    }
+
+    private static List<Tuple<Connector, Connector>> GetRefConnectionPairs(Element element)
+    {
+      var refConnectionPairs = new List<Tuple<Connector, Connector>>();
+      var connectors = GetConnectors(element);
+      var connectorsIterator = connectors.ForwardIterator();
+      connectorsIterator.Reset();
+      while (connectorsIterator.MoveNext())
+      {
+        var connector = connectorsIterator.Current as Connector;
+        if (connector != null && connector.IsConnected)
+        {
+          var refs = connector.AllRefs;
+          var refsIterator = refs.ForwardIterator();
+          refsIterator.Reset();
+          while (refsIterator.MoveNext())
+          {
+            var refConnector = refsIterator.Current as Connector;
+            if (refConnector != null && !refConnector.Owner.Id.Equals(element.Id) && !(refConnector.Owner is MEPSystem))
+              refConnectionPairs.Add(Tuple.Create(connector, refConnector));
+          }
+        }
+        else
+        {
+          refConnectionPairs.Add(Tuple.Create<Connector, Connector>(connector, null));
+        }
+      }
+      return refConnectionPairs;
+    }
+
+    private static ConnectorSet GetConnectors(Element e)
+    {
+      return e is MEPCurve curve ?
+        curve.ConnectorManager.Connectors :
+        (e as DB.FamilyInstance)?.MEPModel?.ConnectorManager?.Connectors ?? new ConnectorSet();
+    }
+
+    private Connector GetConnectorByPoint(Element element, XYZ point)
+    {
+      switch (element)
+      {
+        case MEPCurve o:
+          return o.ConnectorManager.Connectors.Cast<Connector>().FirstOrDefault(c => c.Origin.IsAlmostEqualTo(point, 0.00001));
+        case DB.FamilyInstance o:
+          return o.MEPModel?.ConnectorManager.Connectors.Cast<Connector>().FirstOrDefault(c => c.Origin.IsAlmostEqualTo(point, 0.00001));
+        default:
+          return null;
+      }
+    }
+
+    private MEPCurve CreateCurve(RevitNetworkLink link)
+    {
+      var direction = VectorToNative(link.direction);
+      var start = PointToNative(link.origin);
+      var end = start.Add(direction.Multiply(2));
+
+      var sfi = link.elements.FirstOrDefault(e => e.elements is BuiltElements.Revit.FamilyInstance)?.elements as BuiltElements.Revit.FamilyInstance;
+      Level level = ConvertLevelToRevit(sfi.level, out ApplicationObject.State state);
+
+      Domain domain = Enum.TryParse(link.domain, out domain) ? domain : Domain.DomainUndefined;
+      ConnectorProfileType profile = Enum.TryParse(link.shape, out profile) ? profile : ConnectorProfileType.Invalid;
+
+      MEPCurveType curveType = null;
+      MEPCurve curve = null;
+      switch (domain)
+      {
+        case Domain.DomainHvac:
+          curveType = GetDefaultMEPCurveType(Doc, typeof(DuctType), profile);
+          if (curveType == null) goto default;
+          var mechanicalSystemType = new FilteredElementCollector(Doc).WhereElementIsElementType().OfClass(typeof(MechanicalSystemType)).ToElements().Cast<MechanicalSystemType>().FirstOrDefault(x => x.Name == link.systemType);
+          curve = Duct.Create(Doc, mechanicalSystemType.Id, curveType.Id, level.Id, start, end);
+          if (curveType.Shape == ConnectorProfileType.Round)
+          {
+            curve.get_Parameter(BuiltInParameter.RBS_CURVE_DIAMETER_PARAM).Set(link.diameter);
+          }
+          else
+          {
+            curve.get_Parameter(BuiltInParameter.RBS_CURVE_WIDTH_PARAM).Set(link.width);
+            curve.get_Parameter(BuiltInParameter.RBS_CURVE_HEIGHT_PARAM).Set(link.height);
+          }
+          break;
+        case Domain.DomainPiping:
+          curveType = GetDefaultMEPCurveType(Doc, typeof(PipeType), profile);
+          if (curveType == null) goto default;
+          var pipingSystemType = new FilteredElementCollector(Doc).WhereElementIsElementType().OfClass(typeof(PipingSystemType)).ToElements().Cast<PipingSystemType>().FirstOrDefault(x => x.Name == link.systemType);
+          curve = Pipe.Create(Doc, pipingSystemType.Id, curveType.Id, level.Id, start, end);
+          curve.get_Parameter(BuiltInParameter.RBS_PIPE_DIAMETER_PARAM).Set(link.diameter);
+          break;
+        case Domain.DomainCableTrayConduit:
+          if (profile == ConnectorProfileType.Rectangular)
+          {
+            curveType = GetDefaultMEPCurveType(Doc, typeof(CableTrayType), profile);
+            if (curveType == null) goto default;
+            curve = CableTray.Create(Doc, curveType.Id, start, end, level.Id);
+            curve.get_Parameter(BuiltInParameter.RBS_CABLETRAY_WIDTH_PARAM).Set(link.width);
+            curve.get_Parameter(BuiltInParameter.RBS_CABLETRAY_HEIGHT_PARAM).Set(link.height);
+          }
+          else
+          {
+            curveType = GetDefaultMEPCurveType(Doc, typeof(ConduitType), profile);
+            if (curveType == null) goto default;
+            curve = Conduit.Create(Doc, curveType.Id, start, end, level.Id);
+            curve.get_Parameter(BuiltInParameter.RBS_CONDUIT_DIAMETER_PARAM).Set(link.diameter);
+          }
+          break;
+        default:
+          return curve;
+      }
+      return curve;
+    }
+
+    private static MEPCurveType GetDefaultMEPCurveType(Document doc, Type type, ConnectorProfileType shape)
+    {
+      return new FilteredElementCollector(doc)
+          .WhereElementIsElementType()
+          .OfClass(type)
+          .FirstOrDefault(t => t is MEPCurveType type && type.Shape == shape) as MEPCurveType;
+    }
+  }
+}
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertPipe.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertPipe.cs
index f22d8f7052..e5c9809f84 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertPipe.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertPipe.cs	
@@ -156,6 +156,10 @@ public BuiltElements.Pipe PipeToSpeckle(DB.Plumbing.Pipe revitPipe)
         "RBS_PIPE_DIAMETER_PARAM",
         "CURVE_ELEM_LENGTH",
         "RBS_START_LEVEL_PARAM",
+        "RBS_CURVE_HOR_OFFSET_PARAM",
+        "RBS_CURVE_VERT_OFFSET_PARAM",
+        "RBS_PIPE_BOTTOM_ELEVATION",
+        "RBS_PIPE_TOP_ELEVATION"
       });
       return specklePipe;
     }
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertProjectInfo.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertProjectInfo.cs
index cd144cf70f..265eb77d20 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertProjectInfo.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertProjectInfo.cs	
@@ -7,8 +7,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using DB = Autodesk.Revit.DB;
-using RevitElementType = Objects.BuiltElements.Revit.RevitElementType;
 using ProjectInfo = Objects.BuiltElements.Revit.ProjectInfo;
+using RevitElementType = Objects.BuiltElements.Revit.RevitElementType;
 
 namespace Objects.Converter.Revit
 {
@@ -16,6 +16,8 @@ public partial class ConverterRevit
   {
     private RevitElementType ElementTypeToSpeckle(DB.ElementType revitType)
     {
+      var fs = revitType as FamilySymbol;
+
       var speckleType = new RevitElementType
       {
         type = revitType.Name,
@@ -23,6 +25,12 @@ private RevitElementType ElementTypeToSpeckle(DB.ElementType revitType)
         category = revitType.Category.Name
       };
 
+      if (fs != null && fs.Family != null)
+      {
+        speckleType.placementType = fs.Family?.FamilyPlacementType.ToString();
+        speckleType.hasFamilySymbol = true;
+      }
+
       GetAllRevitParamsAndIds(speckleType, revitType);
 
 
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertRevitElement.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertRevitElement.cs
index cd67e90703..5e4c8259f9 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertRevitElement.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertRevitElement.cs	
@@ -24,14 +24,25 @@ public RevitElement RevitElementToSpeckle(Element revitElement, out List<string>
         speckleElement.type = revitElement.Name;
       }
 
+      var baseGeometry = LocationToSpeckle(revitElement);
+      if (baseGeometry is Geometry.Point point)
+        speckleElement["basePoint"] = point;
+      else if (baseGeometry is Geometry.Line line)
+        speckleElement["baseLine"] = line;
+
       speckleElement.category = revitElement.Category.Name;
       speckleElement.displayValue = GetElementDisplayMesh(revitElement, new Options() { DetailLevel = ViewDetailLevel.Fine, ComputeReferences = false });
 
       //Only send elements that have a mesh, if not we should probably support them properly via direct conversions
       if (speckleElement.displayValue == null || speckleElement.displayValue.Count == 0)
       {
-        notes.Add("Not sending elements without display meshes");
-        return null;
+        speckleElement.displayValue = GetFabricationMeshes(revitElement);
+
+        if (speckleElement.displayValue == null || speckleElement.displayValue.Count == 0)
+        {
+          notes.Add("Not sending elements without display meshes");
+          return null;
+        }
       }
 
       GetAllRevitParamsAndIds(speckleElement, revitElement);
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertRoof.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertRoof.cs
index d7ee65ac32..c0dda9fdf7 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertRoof.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertRoof.cs	
@@ -68,6 +68,23 @@ public ApplicationObject RoofToNative(Roof speckleRoof)
           {
             ModelCurveArray curveArray = new ModelCurveArray();
             var revitFootprintRoof = Doc.Create.NewFootPrintRoof(outline, level, roofType, out curveArray);
+
+            // if the roof is a curtain roof then set the mullions at the borders
+            if (revitFootprintRoof.CurtainGrids != null && speckleFootprintRoof["elements"] is List<Base> elements && elements.Count != 0)
+            {
+              // TODO: Create a new type instead of overriding the type. This could affect other elements
+              var param = roofType.get_Parameter(BuiltInParameter.AUTO_MULLION_BORDER1_GRID1);
+              var type = Doc.GetElement(param.AsElementId());
+              if (type == null)
+              {
+                // assuming first mullion is the desired mullion for the whole roof...
+                GetElementType<MullionType>(elements.Where(b=>b is BuiltElements.Revit.FamilyInstance f).First(), new ApplicationObject("", ""), out MullionType mullionType);
+                TrySetParam(roofType, BuiltInParameter.AUTO_MULLION_BORDER1_GRID1, mullionType);
+                TrySetParam(roofType, BuiltInParameter.AUTO_MULLION_BORDER1_GRID2, mullionType);
+                TrySetParam(roofType, BuiltInParameter.AUTO_MULLION_BORDER2_GRID1, mullionType);
+                TrySetParam(roofType, BuiltInParameter.AUTO_MULLION_BORDER2_GRID2, mullionType);
+              }
+            }
             var poly = speckleFootprintRoof.outline as Polycurve;
             bool hasSlopedSide = false;
             if (poly != null)
@@ -83,13 +100,14 @@ public ApplicationObject RoofToNative(Roof speckleRoof)
                   revitFootprintRoof.set_DefinesSlope(curveArray.get_Item(i), isSloped == true);
                   if (slopeAngle != null && isSloped == true)
                   {
-                    revitFootprintRoof.set_SlopeAngle(curveArray.get_Item(i), (double)slopeAngle * Math.PI / 180);
+                    // slope is set using actual slope (rise / run) for this method
+                    revitFootprintRoof.set_SlopeAngle(curveArray.get_Item(i), Math.Tan((double)slopeAngle * Math.PI / 180));
                     hasSlopedSide = true;
                   }
                 }
 
                 if (offset != null)
-                  revitFootprintRoof.set_Offset(curveArray.get_Item(i), (double)offset);
+                  revitFootprintRoof.set_Offset(curveArray.get_Item(i), ScaleToNative((double)offset, speckleFootprintRoof.units));
               }
             }
 
@@ -115,7 +133,7 @@ public ApplicationObject RoofToNative(Roof speckleRoof)
           }
         default:
           appObj.Update(status: ApplicationObject.State.Failed, logItem: "Roof type not supported, please try with RevitExtrusionRoof or RevitFootprintRoof");
-          return  appObj;
+          return appObj;
       }
 
       Doc.Regenerate();
@@ -133,6 +151,8 @@ public ApplicationObject RoofToNative(Roof speckleRoof)
         SetInstanceParameters(revitRoof, speckleRevitRoof);
 
       appObj.Update(status: ApplicationObject.State.Created, createdId: revitRoof.UniqueId, convertedItem: revitRoof);
+
+      Doc.Regenerate();
       appObj = SetHostedElements(speckleRoof, revitRoof, appObj);
       return appObj;
     }
@@ -140,7 +160,7 @@ public ApplicationObject RoofToNative(Roof speckleRoof)
     private Roof RoofToSpeckle(DB.RoofBase revitRoof, out List<string> notes)
     {
       notes = new List<string>();
-      var profiles = GetProfiles(revitRoof);
+      List<ICurve> profiles = null;
 
       var speckleRoof = new RevitRoof();
 
@@ -156,6 +176,41 @@ private Roof RoofToSpeckle(DB.RoofBase revitRoof, out List<string> notes)
               slope = GetParamValue<double?>(footPrintRoof, BuiltInParameter.ROOF_SLOPE) //NOTE: can be null if the sides have different slopes
             };
 
+            // MEGA HACK to get the slope arrow of a roof which is technically not accessable by the api
+            // https://forums.autodesk.com/t5/revit-api-forum/access-parameters-of-slope-arrow/td-p/8134470
+            List<ElementId> deleted = null;
+            Geometry.Point tail = null;
+            Geometry.Point head = null;
+            double tailOffset = 0;
+            double headOffset = 0;
+            using (Transaction t = new Transaction(Doc, "TTT"))
+            {
+              t.Start();
+              deleted = Doc.Delete(footPrintRoof.Id).ToList();
+              t.RollBack();
+            }
+            foreach (ElementId id in deleted)
+            {
+              ModelLine l = Doc.GetElement(id) as ModelLine;
+              if (l == null) continue;
+              if (!l.Name.Equals("Slope Arrow")) continue;
+
+              tail = PointToSpeckle(((LocationCurve)l.Location).Curve.GetEndPoint(0));
+              head = PointToSpeckle(((LocationCurve)l.Location).Curve.GetEndPoint(1));
+              tailOffset = GetParamValue<double>(l, BuiltInParameter.SLOPE_START_HEIGHT);
+              headOffset = GetParamValue<double>(l, BuiltInParameter.SLOPE_END_HEIGHT);
+
+              break;
+            }
+
+            // these two values are not null then the slope arrow exists and we need to capture that
+            if (tail != null && head != null)
+            {
+              var newTail = new Geometry.Point(tail.x, tail.y, tailOffset);
+              var newHead = new Geometry.Point(head.x, head.y, headOffset);
+              profiles = GetProfiles(revitRoof, newTail, newHead);
+            }
+
             speckleRoof = speckleFootprintRoof;
             break;
           }
@@ -178,6 +233,9 @@ private Roof RoofToSpeckle(DB.RoofBase revitRoof, out List<string> notes)
       speckleRoof.type = elementType.Name;
       speckleRoof.family = elementType.FamilyName;
 
+      if (profiles == null)
+        profiles = GetProfiles(revitRoof);
+
       // TODO handle case if not one of our supported roofs
       if (profiles.Any())
       {
@@ -197,7 +255,7 @@ private Roof RoofToSpeckle(DB.RoofBase revitRoof, out List<string> notes)
     }
 
     //Nesting the various profiles into a polycurve segments
-    private List<ICurve> GetProfiles(DB.RoofBase roof)
+    private List<ICurve> GetProfiles(DB.RoofBase roof, Geometry.Point tailPoint = null, Geometry.Point headPoint = null)
     {
       // TODO handle case if not one of our supported roofs
       var profiles = new List<ICurve>();
@@ -207,6 +265,49 @@ private List<ICurve> GetProfiles(DB.RoofBase roof)
         case FootPrintRoof footprint:
           {
             ModelCurveArrArray crvLoops = footprint.GetProfiles();
+            ModelCurve definesRoofSlope = null;
+            double roofSlope = 0;
+
+            // if headpoint and tailpoint are not null, it means that the user is using a 
+            // slope arrow to define the slope. Slope arrows are not creatable via the api
+            // so we have to translate that into sloped segments.
+            // if the user's slope arrow is not perpendicular to the segment that it is attached to 
+            // then it will not work (this is just a limitation of sloped segments in Revit)
+            // see this api wish https://forums.autodesk.com/t5/revit-ideas/api-access-to-create-amp-modify-slope-arrow/idi-p/6700081
+            if (tailPoint != null && headPoint != null)
+            {
+              for (var i = 0; i < crvLoops.Size; i++)
+              {
+                if (definesRoofSlope != null)
+                  break;
+
+                var crvLoop = crvLoops.get_Item(i);
+                var poly = new Polycurve(ModelUnits);
+                foreach (DB.ModelCurve curve in crvLoop)
+                {
+                  if (curve == null)
+                    continue;
+                  if (!(curve.Location is DB.LocationCurve c))
+                    continue;
+                  if (!(c.Curve is DB.Line line))
+                    continue;
+
+                  var start = PointToSpeckle(line.GetEndPoint(0));
+                  var end = PointToSpeckle(line.GetEndPoint(1));
+
+                  if (!IsBetween(start, end, tailPoint))
+                    continue;
+
+                  if (!CheckOrtho(start.x, start.y, end.x, end.y, tailPoint.x, tailPoint.y, headPoint.x, headPoint.y))
+                    break;
+
+                  definesRoofSlope = curve;
+                  var distance = Math.Sqrt((Math.Pow(headPoint.x - tailPoint.x, 2) + Math.Pow(headPoint.y - tailPoint.y, 2)));
+                  roofSlope = Math.Atan((headPoint.z - tailPoint.z) / distance) * 180 / Math.PI;
+                  break;
+                }
+              }
+            }
 
             for (var i = 0; i < crvLoops.Size; i++)
             {
@@ -218,9 +319,18 @@ private List<ICurve> GetProfiles(DB.RoofBase roof)
                   continue;
 
                 var segment = CurveToSpeckle(curve.GeometryCurve) as Base; //it's a safe casting
-                segment["slopeAngle"] = GetParamValue<double>(curve, BuiltInParameter.ROOF_SLOPE);
-                segment["isSloped"] = GetParamValue<bool>(curve, BuiltInParameter.ROOF_CURVE_IS_SLOPE_DEFINING);
-                segment["offset"] = GetParamValue<double>(curve, BuiltInParameter.ROOF_CURVE_HEIGHT_OFFSET);
+                if (definesRoofSlope != null && curve == definesRoofSlope)
+                {
+                  segment["slopeAngle"] = roofSlope;
+                  segment["isSloped"] = true;
+                  segment["offset"] = tailPoint.z;
+                }
+                else
+                {
+                  segment["slopeAngle"] = GetParamValue<double>(curve, BuiltInParameter.ROOF_SLOPE);
+                  segment["isSloped"] = GetParamValue<bool>(curve, BuiltInParameter.ROOF_CURVE_IS_SLOPE_DEFINING);
+                  segment["offset"] = GetParamValue<double>(curve, BuiltInParameter.ROOF_CURVE_HEIGHT_OFFSET);
+                }
                 poly.segments.Add(segment as ICurve);
 
                 //roud profiles are returned duplicated!
@@ -249,5 +359,67 @@ private List<ICurve> GetProfiles(DB.RoofBase roof)
       }
       return profiles;
     }
+
+    // checks if point c is between a and b
+    private bool IsBetween(Geometry.Point a, Geometry.Point b, Geometry.Point c)
+    {
+      var crossproduct = (c.y - a.y) * (b.x - a.x) - (c.x - a.x) * (b.y - a.y);
+
+      // compare versus epsilon for floating point values, or != 0 if using integers
+      if (Math.Abs(crossproduct) > TOLERANCE)
+          return false;
+
+      var dotProduct = (c.x - a.x) * (b.x - a.x) + (c.y - a.y) * (b.y - a.y);
+      if (dotProduct < 0)
+        return false;
+
+      var squaredLengthBA = (b.x - a.x) * (b.x - a.x) + (b.y - a.y) * (b.y - a.y);
+      if (dotProduct > squaredLengthBA)
+        return false;
+
+      return true;
+    }
+
+    private bool CheckOrtho(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
+    {
+      double m1, m2;
+
+      // Both lines have infinite slope
+      if (Math.Abs(x2 - x1) < TOLERANCE && Math.Abs(x4 - x3) < TOLERANCE)
+        return false;
+
+      // Only line 1 has infinite slope
+      else if (Math.Abs(x2 - x1) < TOLERANCE)
+      {
+        m2 = (y4 - y3) / (x4 - x3);
+        if (Math.Abs(m2) < TOLERANCE)
+          return true;
+        else
+          return false;
+      }
+
+      // Only line 2 has infinite slope
+      else if (Math.Abs(x4 - x3) < TOLERANCE)
+      {
+        m1 = (y2 - y1) / (x2 - x1);
+        if (Math.Abs(m1) < TOLERANCE)
+          return true;
+        else
+          return false;
+      }
+
+      else
+      {
+        // Find slopes of the lines
+        m1 = (y2 - y1) / (x2 - x1);
+        m2 = (y4 - y3) / (x4 - x3);
+
+        // Check if their product is -1
+        if (Math.Abs(m1 * m2 + 1) < TOLERANCE)
+          return true;
+        else
+          return false;
+      }
+    }
   }
 }
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertTopography.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertTopography.cs
index 937f9f882a..99a8c6f591 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertTopography.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertTopography.cs	
@@ -33,26 +33,12 @@ public ApplicationObject TopographyToNative(Topography speckleSurface)
           pts.Add(PointToNative(point));
         }
 
-#if !REVIT2019
-        facets.Capacity += (int) (displayMesh.faces.Count / 4f) * 3;
-        int j = 0;
-        while (j < displayMesh.faces.Count)
-        {
-          facets.Add(new PolymeshFacet(displayMesh.faces[j + 1], displayMesh.faces[j + 2], displayMesh.faces[j + 3]));
-          j += 4;
-        }
-#endif
       }
 
       if (docObj != null)
         Doc.Delete(docObj.Id);
 
-      TopographySurface revitSurface = null;
-#if !REVIT2019
-      revitSurface = TopographySurface.Create(Doc, pts, facets);
-#else
-      revitSurface = TopographySurface.Create(Doc, pts);
-#endif
+      var revitSurface = TopographySurface.Create(Doc, pts);
       if (speckleSurface is RevitTopography rt)
         SetInstanceParameters(revitSurface, rt);
 
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertView.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertView.cs
index 30ce2f7b2b..708bf81b22 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertView.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertView.cs	
@@ -1,6 +1,7 @@
 using Autodesk.Revit.DB;
 using Speckle.Core.Models;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using DB = Autodesk.Revit.DB;
@@ -11,6 +12,10 @@ namespace Objects.Converter.Revit
 {
   public partial class ConverterRevit
   {
+    private List<string> excludedParameters = new List<string>()
+    {
+      "VIEW_NAME", // param value is already stored in name prop of view and setting this param can cause errors 
+    };
     public View ViewToSpeckle(DB.View revitView)
     {
       switch (revitView.ViewType)
@@ -59,58 +64,73 @@ public View ViewToSpeckle(DB.View revitView)
         AttachViewParams(speckleView, rv3d);
       }
 
-      GetAllRevitParamsAndIds(speckleView, revitView);
+      GetAllRevitParamsAndIds(speckleView, revitView, excludedParameters);
       Report.Log($"Converted View {revitView.ViewType} {revitView.Id}");
       return speckleView;
     }
 
-    public DB.View ViewToNative(View3D speckleView)
+    public ApplicationObject ViewToNative(View3D speckleView)
     {
-      var editViewName = EditViewName(speckleView.name, "SpeckleView");
+      var appObj = new ApplicationObject(speckleView.id, speckleView.speckle_type) { applicationId = speckleView.applicationId };
 
-      // get view3d type
-      var viewType = new FilteredElementCollector(Doc)
-        .WhereElementIsElementType()
-        .OfClass(typeof(ViewFamilyType))
-        .ToElements()
-        .Cast<ViewFamilyType>()
-        .FirstOrDefault(o => o.ViewFamily == ViewFamily.ThreeDimensional);
+      DB.View3D view = null;
+      var viewNameSplit = speckleView.name.Split('-');
 
       // get orientation
       var up = new XYZ(speckleView.upDirection.x, speckleView.upDirection.y, speckleView.upDirection.z).Normalize(); //unit vector
       var forward = new XYZ(speckleView.forwardDirection.x, speckleView.forwardDirection.y, speckleView.forwardDirection.z).Normalize();
       if (Math.Round(up.DotProduct(forward), 3) != 0) // will throw error if vectors are not perpendicular
-        return null;
+      {
+        appObj.Update(status: ApplicationObject.State.Failed, logItem: "The up and forward vectors for this view are not perpendicular.");
+        return appObj;
+      }
       var orientation = new ViewOrientation3D(PointToNative(speckleView.origin), up, forward);
 
-      // create view
-      DB.View3D view = null;
-      if (speckleView.isOrthogonal)
-        view = DB.View3D.CreateIsometric(Doc, viewType.Id);
+      var editViewName = EditViewName(speckleView.name, "SpeckleView");
+      // get the existing view with this name, if there is one
+      view = new FilteredElementCollector(Doc)
+          .WhereElementIsNotElementType()
+          .OfClass(typeof(DB.View3D))
+          .Cast<DB.View3D>()
+          .FirstOrDefault(o => o.Name == editViewName);
+
+      if (view == null)
+      {
+        // get view3d type
+        var viewType = new FilteredElementCollector(Doc)
+          .WhereElementIsElementType()
+          .OfClass(typeof(ViewFamilyType))
+          .ToElements()
+          .Cast<ViewFamilyType>()
+          .FirstOrDefault(o => o.ViewFamily == ViewFamily.ThreeDimensional);
+
+        // create view
+        if (speckleView.isOrthogonal)
+          view = DB.View3D.CreateIsometric(Doc, viewType.Id);
+        else
+          view = DB.View3D.CreatePerspective(Doc, viewType.Id);
+
+        view.Name = editViewName;
+        appObj.Update(status: ApplicationObject.State.Created);
+      }
+      else if (view.IsLocked)
+      {
+        appObj.Update(status: ApplicationObject.State.Failed, logItem: $"View named {editViewName} is locked and cannot be modified.");
+        return appObj;
+      }
       else
-        view = DB.View3D.CreatePerspective(Doc, viewType.Id);
+        appObj.Update(status: ApplicationObject.State.Updated);
 
       // set props
       view.SetOrientation(orientation);
       view.SaveOrientationAndLock();
 
       if (view.IsValidObject)
-        SetInstanceParameters(view, speckleView);
+        SetInstanceParameters(view, speckleView, excludedParameters);
       view = SetViewParams(view, speckleView);
 
-      // set name last due to duplicate name errors
-      try
-      {
-        view.Name = editViewName;
-        return view;
-      }
-      catch (Exception e)
-      {
-        Report.ConversionErrors.Add(new Exception($@"View {editViewName} already exists."));
-        view.Dispose();
-        view = null;
-        return null;
-      }
+      appObj.Update(createdId: view.UniqueId, convertedItem: view);
+      return appObj;
     }
 
     private void AttachViewParams(View speckleView, DB.View view)
@@ -155,6 +175,11 @@ private XYZ CalculateTarget(DB.View3D view, XYZ forward)
 
     private string EditViewName(string name, string prefix = null)
     {
+      var viewNameSplit = name.Split('-');
+      // if the name already starts with the prefix, don't add the prefix again
+      if (viewNameSplit.Length > 0 && viewNameSplit.First() == prefix)
+        return name;
+
       var newName = name;
       // append commit info as prefix
       if (prefix != null)
@@ -177,5 +202,28 @@ private string EditViewName(string name, string prefix = null)
 
       return corrected;
     }
+
+    /// <summary>
+    /// Converts a Speckle comment camera coordinates into Revit's
+    /// First three values are the camera's position, second three the target
+    /// </summary>
+    /// <param name="speckleCamera"></param>
+    /// <returns></returns>
+    public DB.ViewOrientation3D ViewOrientation3DToNative(Base baseCamera)
+    {
+      //hacky but the current comments camera is not a Base object
+      var speckleCamera = baseCamera["coordinates"] as List<double>;
+      var position = new Objects.Geometry.Point(speckleCamera[0], speckleCamera[1], speckleCamera[2]);
+      var target = new Objects.Geometry.Point(speckleCamera[3], speckleCamera[4], speckleCamera[5]);
+
+
+      var cameraTarget = PointToNative(target);
+      var cameraPosition = PointToNative(position);
+      var cameraDirection = (cameraTarget.Subtract(cameraPosition)).Normalize();
+      var cameraUpVector = cameraDirection.CrossProduct(XYZ.BasisZ).CrossProduct(cameraDirection);
+
+
+      return new ViewOrientation3D(cameraPosition, cameraUpVector, cameraDirection);
+    }
   }
 }
\ No newline at end of file
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertWall.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertWall.cs
index fe284219db..51e6faeefa 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertWall.cs	
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertWall.cs	
@@ -1,12 +1,12 @@
-using Autodesk.Revit.DB;
+using Autodesk.Revit.DB;
 using Objects.BuiltElements.Revit;
 using Speckle.Core.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using DB = Autodesk.Revit.DB;
 using Mesh = Objects.Geometry.Mesh;
-using System.Text.RegularExpressions;
 
 namespace Objects.Converter.Revit
 {
@@ -43,7 +43,8 @@ public ApplicationObject WallToNative(BuiltElements.Wall speckleWall)
       var baseCurve = CurveToNative(speckleWall.baseLine).get_Item(0);
 
       List<string> joinSettings = new List<string>();
-      if (Settings.ContainsKey("disallow-join"))
+      
+      if (Settings.ContainsKey("disallow-join") && !string.IsNullOrEmpty(Settings["disallow-join"]))
         joinSettings = new List<string>(Regex.Split(Settings["disallow-join"], @"\,\ "));
 
       if (speckleWall is RevitWall speckleRevitWall)
@@ -147,7 +148,7 @@ public ApplicationObject WallToNative(BuiltElements.Wall speckleWall)
 
       var state = isUpdate ? ApplicationObject.State.Updated : ApplicationObject.State.Created;
       appObj.Update(status: state, createdId: revitWall.UniqueId, convertedItem: revitWall);
-      
+
       appObj = SetHostedElements(speckleWall, revitWall, appObj);
       return appObj;
     }
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Revit/ConnectionPair.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Revit/ConnectionPair.cs
new file mode 100644
index 0000000000..d03fa2f4e5
--- /dev/null
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Revit/ConnectionPair.cs
@@ -0,0 +1,107 @@
+using Autodesk.Revit.DB;
+using System;
+using System.Collections.Generic;
+
+namespace ConverterRevitShared.Revit
+{
+  public class ConnectionPair : IComparable<ConnectionPair>, IEquatable<ConnectionPair>
+  {
+    public Element Owner { get; private set; }
+
+    public Connector Connector { get; private set; }
+
+    public Connector RefConnector { get; private set; }
+
+    public double Diameter { get; private set; }
+
+    public double Height { get; private set; }
+
+    public double Width { get; private set; }
+
+    public bool IsConnected { get; private set; }
+
+    public string Name => RefConnector != null
+      ? $"{Owner.Category.Name}: {Connector.Owner.Name} --> {RefConnector.Owner.Category.Name}: {RefConnector.Owner.Name}"
+      : $"{Owner.Category.Name}: {Connector.Owner.Name} --> NULL";
+
+    private ConnectionPair(Element element, Connector connector, Connector refConnector = null)
+    {
+      Owner = element;
+      Connector = connector;
+      RefConnector = refConnector;
+      IsConnected = RefConnector != null;
+      var curve = element as MEPCurve;
+      switch (Connector.Shape)
+      {
+        case ConnectorProfileType.Invalid:
+          break;
+        case ConnectorProfileType.Round:
+          Diameter = curve != null ? curve.Diameter : Connector.Radius * 2;
+          break;
+        default:
+          Height = curve != null ? curve.Height : Connector.Height;
+          Width = curve != null ? curve.Width : Connector.Width;
+          break;
+      }
+    }
+
+    public static ICollection<ConnectionPair> GetConnectionPairs(Element element)
+    {
+      var connectionPairs = new List<ConnectionPair>();
+      var connectors = GetConnectors(element);
+      var connectorsIterator = connectors.ForwardIterator();
+      connectorsIterator.Reset();
+      while (connectorsIterator.MoveNext())
+      {
+        var connector = connectorsIterator.Current as Connector;
+        if (connector != null && connector.IsConnected)
+        {
+          var refs = connector.AllRefs;
+          var refsIterator = refs.ForwardIterator();
+          refsIterator.Reset();
+          while (refsIterator.MoveNext())
+          {
+            var refConnector = refsIterator.Current as Connector;
+            if (refConnector != null && !refConnector.Owner.Id.Equals(element.Id) && !(refConnector.Owner is MEPSystem))
+              connectionPairs.Add(new ConnectionPair(element, connector, refConnector));
+          }
+        }
+        else
+        {
+          connectionPairs.Add(new ConnectionPair(element, connector, null));
+        }
+      }
+      return connectionPairs;
+    }
+
+    public bool IsValid()
+    {
+      return Connector.Owner.Id.Equals(Owner.Id) && RefConnector != null ? 
+        Connector.IsConnectedTo(RefConnector):
+        true;
+    }
+
+    public int CompareTo(ConnectionPair other)
+    {
+      return Convert.ToInt32(Equals(other));
+    }
+
+    public bool Equals(ConnectionPair other)
+    {
+      return Owner.Id.Equals(other.Owner.Id) && RefConnector?.Owner?.Id == other.RefConnector?.Owner?.Id;
+    }
+
+    public bool ConnectedToCurve(out MEPCurve curve)
+    {
+      curve = RefConnector?.Owner as MEPCurve;
+      return curve != null;
+    }
+
+    private static ConnectorSet GetConnectors(Element e)
+    {
+      return e is MEPCurve cure ?
+        cure.ConnectorManager.Connectors:
+        (e as FamilyInstance)?.MEPModel?.ConnectorManager?.Connectors ?? new ConnectorSet();
+    }
+  }
+}
diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/RevitVersionHelper.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/RevitVersionHelper.cs
index 71d53122cf..b20c55d948 100644
--- a/Objects/Converters/ConverterRevit/ConverterRevitShared/RevitVersionHelper.cs
+++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/RevitVersionHelper.cs
@@ -11,7 +11,7 @@ public static string Version
       get
       {
 #if REVIT2022
-          return "2022";
+        return "2022";
 #elif REVIT2021
         return "2021";
 #elif REVIT2020
@@ -126,7 +126,7 @@ public static bool IsCurveClosed(Curve curve)
     }
 
     #region helper functions
-#if !(REVIT2019 || REVIT2020)
+#if !REVIT2020
     private static ForgeTypeId DUTToForgeTypeId(string s)
     {
       ForgeTypeId sourceUnit = null;
diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Geometry.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Geometry.cs
index 2cb2346c36..e30db44dfe 100644
--- a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Geometry.cs
+++ b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Geometry.cs
@@ -617,12 +617,18 @@ public Box BoxToSpeckle(RH.Box box, string units = null)
 
     public RH.Box BoxToNative(Box box)
     {
+      
       return new RH.Box(PlaneToNative(box.basePlane), IntervalToNative(box.xSize), IntervalToNative(box.ySize), IntervalToNative(box.zSize));
     }
 
     // Meshes
     public Mesh MeshToSpeckle(RH.Mesh mesh, string units = null)
     {
+      if (mesh.Vertices.Count == 0 || mesh.Faces.Count == 0)
+      {
+        Report.ConversionErrors.Add(new Exception("Cannot convert empty mesh (0 faces, 0 vertices)"));
+        return null;
+      }
       var u = units ?? ModelUnits;
       var verts = PointsToFlatList(mesh.Vertices.ToPoint3dArray());
 
diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Other.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Other.cs
index 556e439bf4..219414d26f 100644
--- a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Other.cs
+++ b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Other.cs
@@ -1,33 +1,30 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-
-using Rhino.Geometry;
+using Objects.Other;
 using Rhino.Display;
 using Rhino.DocObjects;
+using Rhino.Geometry;
 using Rhino.Render;
-using RH = Rhino.DocObjects;
-
-using Speckle.Core.Models;
 using Speckle.Core.Kits;
-using Utilities = Speckle.Core.Models.Utilities;
-
-using Objects.Other;
+using Speckle.Core.Models;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
 using Arc = Objects.Geometry.Arc;
 using BlockDefinition = Objects.Other.BlockDefinition;
 using BlockInstance = Objects.Other.BlockInstance;
-using DisplayStyle = Objects.Other.DisplayStyle;
 using Dimension = Objects.Other.Dimension;
+using DisplayStyle = Objects.Other.DisplayStyle;
 using Hatch = Objects.Other.Hatch;
 using HatchLoop = Objects.Other.HatchLoop;
 using Line = Objects.Geometry.Line;
 using Plane = Objects.Geometry.Plane;
 using Point = Objects.Geometry.Point;
 using Polyline = Objects.Geometry.Polyline;
+using RenderMaterial = Objects.Other.RenderMaterial;
+using RH = Rhino.DocObjects;
 using Text = Objects.Other.Text;
 using Transform = Objects.Other.Transform;
-using RenderMaterial = Objects.Other.RenderMaterial;
+using Utilities = Speckle.Core.Models.Utilities;
 
 namespace Objects.Converter.RhinoGh
 {
@@ -102,7 +99,7 @@ public Rhino.Render.RenderMaterial RenderMaterialToNative(RenderMaterial speckle
     {
       var commitInfo = GetCommitInfo();
       var speckleName = $"{commitInfo} - {speckleMaterial.name}";
-      
+
       // check if the doc already has a material with speckle material name, or a previously created speckle material
       var existing = Doc.RenderMaterials.FirstOrDefault(x => x.Name == speckleMaterial.name);
       if (existing != null)
@@ -113,7 +110,7 @@ public Rhino.Render.RenderMaterial RenderMaterialToNative(RenderMaterial speckle
         return existing;
 
       Rhino.Render.RenderMaterial rm;
-//#if RHINO6
+      //#if RHINO6
       var rhinoMaterial = new RH.Material
       {
         Name = speckleName,
@@ -122,7 +119,7 @@ public Rhino.Render.RenderMaterial RenderMaterialToNative(RenderMaterial speckle
         Transparency = 1 - speckleMaterial.opacity
       };
       rm = Rhino.Render.RenderMaterial.CreateBasicMaterial(rhinoMaterial, Doc);
-//#else
+      //#else
       //TODO Convert materials as PhysicallyBasedMaterial 
       // var pbrRenderMaterial = RenderContentType.NewContentFromTypeId(ContentUuids.PhysicallyBasedMaterialType, Doc) as Rhino.Render.RenderMaterial;
       // RH.Material simulatedMaterial = pbrRenderMaterial.SimulatedMaterial(RenderTexture.TextureGeneration.Allow);
@@ -136,8 +133,8 @@ public Rhino.Render.RenderMaterial RenderMaterialToNative(RenderMaterial speckle
       //
       // rm = Rhino.Render.RenderMaterial.FromMaterial(pbr.Material, Doc);
       // rm.Name = speckleName;
-//#endif
-      
+      //#endif
+
       Doc.RenderMaterials.Add(rm);
 
       return rm;
@@ -149,11 +146,11 @@ public RenderMaterial RenderMaterialToSpeckle(RH.Material material)
 
       renderMaterial.name = material.Name ?? "default"; // default rhino material has no name or id
 #if RHINO6
-      
+
       renderMaterial.diffuse = material.DiffuseColor.ToArgb();
       renderMaterial.emissive = material.EmissionColor.ToArgb();
       renderMaterial.opacity = 1 - material.Transparency;
-      
+
       // for some reason some default material transparency props are 1 when they shouldn't be - use this hack for now
       if ((renderMaterial.name.ToLower().Contains("glass") || renderMaterial.name.ToLower().Contains("gem")) && renderMaterial.opacity == 0)
         renderMaterial.opacity = 0.3;
@@ -175,7 +172,7 @@ public RenderMaterial RenderMaterialToSpeckle(RH.Material material)
         renderMaterial.roughness = pbrMaterial.Roughness;
       }
 #endif
-      
+
       return renderMaterial;
     }
 
@@ -414,8 +411,8 @@ public DisplayMaterial RenderMaterialToDisplayMaterial(RenderMaterial material)
       var displayMaterial = new DisplayMaterial(rhinoMaterial);
       return displayMaterial;
     }
-    
-    
+
+
     public RenderMaterial DisplayMaterialToSpeckle(DisplayMaterial material)
     {
       var speckleMaterial = new RenderMaterial();
@@ -424,7 +421,7 @@ public RenderMaterial DisplayMaterialToSpeckle(DisplayMaterial material)
       speckleMaterial.opacity = 1.0 - material.Transparency;
       return speckleMaterial;
     }
-    
+
     public Rhino.Geometry.Transform TransformToNative(Transform speckleTransform, string units = null)
     {
       var u = units ?? speckleTransform.units;
@@ -459,7 +456,7 @@ public Transform TransformToSpeckle(Rhino.Geometry.Transform t, string units = n
         t.M30, t.M31, t.M32, t.M33 };
       return new Transform(transformArray, ModelUnits);
     }
-    
+
     // Text
     public Text TextToSpeckle(TextEntity text)
     {
@@ -515,7 +512,7 @@ public TextEntity TextToNative(Text text)
       Base sourceAppProps = text[RhinoPropName] as Base;
       if (sourceAppProps != null)
       {
-        var scaleProps = new List<string>() { 
+        var scaleProps = new List<string>() {
           "TextHeight" };
         foreach (var scaleProp in scaleProps)
         {
@@ -569,7 +566,7 @@ public Dimension DimensionToSpeckle(Rhino.Geometry.Dimension dimension)
 
             var angularDimension = new AngleDimension() { units = ModelUnits, measurement = (Math.PI / 180) * dimension.NumericValue };
             angularDimension.position = PointToSpeckle(angularDimPoint);
-            angularDimension.measured = new List<Line>() { lineStart, lineEnd};
+            angularDimension.measured = new List<Line>() { lineStart, lineEnd };
             if (o.GetDisplayLines(o.DimensionStyle, o.DimensionScale, out Rhino.Geometry.Line[] lines, out Rhino.Geometry.Arc[] arcs))
             {
               angularDimension.displayValue = lines.Select(l => LineToSpeckle(l) as ICurve).ToList();
@@ -616,7 +613,7 @@ public Dimension DimensionToSpeckle(Rhino.Geometry.Dimension dimension)
         _dimension.value = dimension.PlainText;
         _dimension.richText = dimension.RichText;
         _dimension.textPosition = PointToSpeckle(textPoint);
-        
+
         // set rhino props
         var style = dimension.DimensionStyle.HasName ? dimension.DimensionStyle.Name : String.Empty;
         if (!string.IsNullOrEmpty(style)) props["DimensionStyleName"] = style;
@@ -645,7 +642,7 @@ public Rhino.Geometry.Dimension RhinoDimensionToNative(Dimension dimension)
           DistanceDimension linearDimension = dimension as DistanceDimension;
           var start = PointToNative(linearDimension.measured[0]).Location;
           var end = PointToNative(linearDimension.measured[1]).Location;
-          bool isRotated = sourceAppProps["AnnotationType"] as string == AnnotationType.Rotated.ToString() ? true : false ;
+          bool isRotated = sourceAppProps["AnnotationType"] as string == AnnotationType.Rotated.ToString() ? true : false;
           if (isRotated)
             _dimension = LinearDimension.Create(AnnotationType.Rotated, dimensionStyle, plane, Vector3d.XAxis, start, end, position, 0);
           else
@@ -705,7 +702,7 @@ public Rhino.Geometry.Dimension DimensionToNative(Dimension dimension)
         case LengthDimension o:
           switch (o.measured)
           {
-            case Line l: 
+            case Line l:
               var radialLine = LineToNative(l);
               var radialDimension = RadialDimension.Create(style, AnnotationType.Radius, plane, radialLine.PointAtStart, radialLine.PointAtEnd, position);
               _dimension = radialDimension;
diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs
index 2b2129c62e..a9c51458cb 100644
--- a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs
+++ b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs
@@ -1,4 +1,5 @@
 using Grasshopper.Kernel.Types;
+using Objects.BuiltElements.Revit;
 using Objects.Geometry;
 using Objects.Other;
 using Objects.Primitive;
@@ -6,10 +7,13 @@
 using Rhino.Display;
 using Rhino.DocObjects;
 using Rhino.Geometry;
+using Speckle.Core.Api;
 using Speckle.Core.Kits;
 using Speckle.Core.Models;
+using Speckle.Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Alignment = Objects.BuiltElements.Alignment;
 using Arc = Objects.Geometry.Arc;
@@ -31,6 +35,7 @@
 using RH = Rhino.Geometry;
 using Spiral = Objects.Geometry.Spiral;
 using Surface = Objects.Geometry.Surface;
+using Text = Objects.Other.Text;
 using Transform = Objects.Other.Transform;
 using Vector = Objects.Geometry.Vector;
 using View3D = Objects.BuiltElements.View3D;
@@ -75,7 +80,7 @@ public IEnumerable<string> GetServicedApplications()
       return new[] { RhinoAppName };
     }
 
-    public RhinoDoc Doc { get; private set; } = Rhino.RhinoDoc.ActiveDoc ?? null;
+    public RhinoDoc Doc { get; private set; }
 
     public List<ApplicationObject> ContextObjects { get; set; } = new List<ApplicationObject>();
 
@@ -96,6 +101,7 @@ public void SetContextDocument(object doc)
 
     // speckle user string for custom schemas
     private string SpeckleSchemaKey = "SpeckleSchema";
+    private string SpeckleMappingKey = "SpeckleMapping";
     private string ApplicationIdKey = "applicationId";
 
     public RH.Mesh GetRhinoRenderMesh(RhinoObject rhinoObj)
@@ -140,6 +146,11 @@ public Base ConvertToSpeckle(object @object)
         if (ro.Attributes.GetUserString(SpeckleSchemaKey) != null) // schema check - this will change in the near future
           schema = ConvertToSpeckleBE(ro, reportObj, displayMesh) ?? ConvertToSpeckleStr(ro, reportObj);
 
+        //mapping tool
+        var mappingString = ro.Attributes.GetUserString(SpeckleMappingKey);
+        if (mappingString != null)
+          schema = MappingToSpeckle(mappingString, ro);
+
         attributes = ro.Attributes;
 
         if (!(@object is InstanceObject)) // block instance check
@@ -295,6 +306,58 @@ public List<Base> ConvertToSpeckle(List<object> objects)
       return objects.Select(x => ConvertToSpeckle(x)).ToList();
     }
 
+    private Base MappingToSpeckle(string mapping, RhinoObject @object)
+    {
+      Base schemaObject = Operations.Deserialize(mapping);
+
+      switch (schemaObject)
+      {
+        case RevitWall o:
+          var extrusion = ((RH.Extrusion)@object.Geometry);
+          var bottomCrv = extrusion.Profile3d(new ComponentIndex(ComponentIndexType.ExtrusionBottomProfile, 0));
+          var topCrv = extrusion.Profile3d(new ComponentIndex(ComponentIndexType.ExtrusionTopProfile, 0));
+          var height = topCrv.PointAtStart.Z - bottomCrv.PointAtStart.Z;
+          o.height = height;
+          o.baseLine = CurveToSpeckle(bottomCrv);
+          break;
+
+        case RevitBeam o:
+          o.baseLine = CurveToSpeckle((RH.Curve)@object.Geometry);
+          break;
+
+        case RevitBrace o:
+          o.baseLine = CurveToSpeckle((RH.Curve)@object.Geometry);
+          break;
+
+        case DirectShape o:
+          o.baseGeometries = new List<Base> { BrepToSpeckle((RH.Brep)@object.Geometry) };
+          break;
+
+        case FreeformElement o:
+          o.baseGeometries = new List<Base> { BrepToSpeckle((RH.Brep)@object.Geometry) };
+          break;
+
+        case FamilyInstance o:
+          if (@object.Geometry is Rhino.Geometry.Point p)
+          {
+            o.basePoint = PointToSpeckle(p);
+          }
+          else if (@object is InstanceObject)
+          {
+            var block = BlockInstanceToSpeckle(@object as InstanceObject);
+            o.basePoint = block.GetInsertionPoint();
+            o.rotation = block.transform.rotationZ;
+          }
+          break;
+
+        default:
+          break;
+      }
+      schemaObject.applicationId = @object.Id.ToString();
+      schemaObject["units"] = ModelUnits;
+      return schemaObject;
+    }
+
     public Base ConvertToSpeckleBE(object @object, ApplicationObject reportObj, RH.Mesh displayMesh)
     {
       // get schema if it exists
@@ -764,5 +827,6 @@ public bool CanConvertToNative(Base @object)
           return false;
       }
     }
+
   }
 }
\ No newline at end of file
diff --git a/Objects/Objects.sln b/Objects/Objects.sln
index 390fc85f66..d191b4e492 100644
--- a/Objects/Objects.sln
+++ b/Objects/Objects.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30011.22
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Objects", "Objects\Objects.csproj", "{95C2153A-642E-4779-90C0-BFF56FC561A9}"
 EndProject
@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterRevitTests", "Conv
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterRevit", "ConverterRevit", "{1987848E-D753-4791-B89E-F74EDF136CB3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2019", "Converters\ConverterRevit\ConverterRevit2019\ConverterRevit2019.csproj", "{0BCB32CF-A3CF-4A6A-A9F8-DFE5D85D608C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2020", "Converters\ConverterRevit\ConverterRevit2020\ConverterRevit2020.csproj", "{E4006179-462F-4133-9481-219279138B93}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2021", "Converters\ConverterRevit\ConverterRevit2021\ConverterRevit2021.csproj", "{BF5515B4-C97C-4FB9-9F93-1740D2B615B3}"
@@ -91,46 +89,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterTeklaStructures202
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterTeklaStructures2020", "Converters\ConverterTeklaStructures\ConverterTeklaStructures2020\ConverterTeklaStructures2020.csproj", "{08EE146E-9F7A-4C82-B790-688FE4532CA7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterGrasshopper6", "Converters\ConverterRhinoGh\ConverterGrasshopper6\ConverterGrasshopper6.csproj", "{1DC0A8F4-1F14-47E8-8456-9D8E9C0E6CFF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterGrasshopper6", "Converters\ConverterRhinoGh\ConverterGrasshopper6\ConverterGrasshopper6.csproj", "{1DC0A8F4-1F14-47E8-8456-9D8E9C0E6CFF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterGrasshopper7", "Converters\ConverterRhinoGh\ConverterGrasshopper7\ConverterGrasshopper7.csproj", "{5A7671D6-57A1-4422-9EBB-79F3C724C0BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterGrasshopper7", "Converters\ConverterRhinoGh\ConverterGrasshopper7\ConverterGrasshopper7.csproj", "{5A7671D6-57A1-4422-9EBB-79F3C724C0BA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterDxf", "Converters\ConverterDxf\ConverterDxf\ConverterDxf.csproj", "{C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDxf", "Converters\ConverterDxf\ConverterDxf\ConverterDxf.csproj", "{C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{08ee146e-9f7a-4c82-b790-688fe4532ca7}*SharedItemsImports = 5
-		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{0bcb32cf-a3cf-4a6a-a9f8-dfe5d85d608c}*SharedItemsImports = 5
-		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{13f93c20-793c-4f2d-b836-68d7744063df}*SharedItemsImports = 5
-		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{156ff86c-8531-46d0-aa23-97db326bc591}*SharedItemsImports = 5
-		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{208b25e4-2d0e-4534-b197-4c5c96cc53ce}*SharedItemsImports = 13
-		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2c68e80f-38f4-41d0-9b38-473031d1b541}*SharedItemsImports = 5
-		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2d0f9f8a-2e89-4780-978a-cd92d6d7b843}*SharedItemsImports = 13
-		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13
-		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{4220c3dc-e198-4084-b74d-85c9b31607f7}*SharedItemsImports = 5
-		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{45ea031d-56a5-4cb3-81dc-af3ef26580e0}*SharedItemsImports = 5
-		Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{4f16a993-7d11-4565-a2a5-910899919e00}*SharedItemsImports = 5
-		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{4f16a993-7d11-4565-a2a5-910899919e00}*SharedItemsImports = 5
-		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{5905f0f8-ae1d-473b-87f3-97e40e6cbe55}*SharedItemsImports = 5
-		Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{5bab09dc-b0fc-4004-9fd5-6496a9634071}*SharedItemsImports = 13
-		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{5bbde14e-50f8-4d6e-8e35-747667ad4a09}*SharedItemsImports = 13
-		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{62e992b6-2e65-4714-ad37-42f34f9bd5da}*SharedItemsImports = 5
-		Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{63b3f901-7c14-4530-8a6f-ccad68586664}*SharedItemsImports = 5
-		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{79aa475d-7cde-4501-90ce-9a0d9d0db023}*SharedItemsImports = 5
-		Converters\ConverterETABS\ConverterETABSShared\ConverterETABSShared.projitems*{7f5a5e2b-d74f-483d-8983-97dc049c6d28}*SharedItemsImports = 13
-		Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{7ffdab72-145d-4490-9892-fac5f1d72b17}*SharedItemsImports = 13
-		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{90362309-466a-482b-814a-adb1ce227607}*SharedItemsImports = 5
-		Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{adc53dc0-0592-4f13-b456-65adcb2164a1}*SharedItemsImports = 5
-		Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13
-		Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b9649e07-f7b4-4fcc-9e44-076993621d0a}*SharedItemsImports = 5
-		Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{bc110327-3c61-4c15-ae4c-daae7ca82a7b}*SharedItemsImports = 5
-		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{bf5515b4-c97c-4fb9-9f93-1740d2b615b3}*SharedItemsImports = 5
-		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{d8cdf95e-f72d-4f3e-8026-b82863f97d64}*SharedItemsImports = 5
-		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{dd4add16-65f9-46e0-a610-2b7908a966b3}*SharedItemsImports = 5
-		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{df4d24c3-2be8-476c-8d40-33892be07b1d}*SharedItemsImports = 5
-		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{e4006179-462f-4133-9481-219279138b93}*SharedItemsImports = 5
-		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{f00b2895-b912-432d-a504-99a82e07d9d4}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -147,10 +112,6 @@ Global
 		{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BCB32CF-A3CF-4A6A-A9F8-DFE5D85D608C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BCB32CF-A3CF-4A6A-A9F8-DFE5D85D608C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BCB32CF-A3CF-4A6A-A9F8-DFE5D85D608C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BCB32CF-A3CF-4A6A-A9F8-DFE5D85D608C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E4006179-462F-4133-9481-219279138B93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4006179-462F-4133-9481-219279138B93}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4006179-462F-4133-9481-219279138B93}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -263,7 +224,6 @@ Global
 		{7EF0C96C-1FD9-42B2-85CE-BFD9B10DAC06} = {986B7226-6A4C-4881-8481-ADAFD0EC70B0}
 		{D9C88135-B4B3-4C6C-A9D9-01A59A00BC0C} = {CCC09288-CE76-4FDB-B0C9-220112F88CD9}
 		{1987848E-D753-4791-B89E-F74EDF136CB3} = {CCC09288-CE76-4FDB-B0C9-220112F88CD9}
-		{0BCB32CF-A3CF-4A6A-A9F8-DFE5D85D608C} = {1987848E-D753-4791-B89E-F74EDF136CB3}
 		{E4006179-462F-4133-9481-219279138B93} = {1987848E-D753-4791-B89E-F74EDF136CB3}
 		{BF5515B4-C97C-4FB9-9F93-1740D2B615B3} = {1987848E-D753-4791-B89E-F74EDF136CB3}
 		{2DCD648D-DCA5-4D2A-8B14-AD2CB85D24B0} = {1987848E-D753-4791-B89E-F74EDF136CB3}
@@ -307,4 +267,37 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DA57EC2E-0A9E-4F59-B1F7-A65F76A74B74}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{08ee146e-9f7a-4c82-b790-688fe4532ca7}*SharedItemsImports = 5
+		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{13f93c20-793c-4f2d-b836-68d7744063df}*SharedItemsImports = 5
+		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{156ff86c-8531-46d0-aa23-97db326bc591}*SharedItemsImports = 5
+		Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{1dc0a8f4-1f14-47e8-8456-9d8e9c0e6cff}*SharedItemsImports = 5
+		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{208b25e4-2d0e-4534-b197-4c5c96cc53ce}*SharedItemsImports = 13
+		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2c68e80f-38f4-41d0-9b38-473031d1b541}*SharedItemsImports = 5
+		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2d0f9f8a-2e89-4780-978a-cd92d6d7b843}*SharedItemsImports = 13
+		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13
+		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{4220c3dc-e198-4084-b74d-85c9b31607f7}*SharedItemsImports = 5
+		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{45ea031d-56a5-4cb3-81dc-af3ef26580e0}*SharedItemsImports = 5
+		Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{4f16a993-7d11-4565-a2a5-910899919e00}*SharedItemsImports = 5
+		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{4f16a993-7d11-4565-a2a5-910899919e00}*SharedItemsImports = 5
+		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{5905f0f8-ae1d-473b-87f3-97e40e6cbe55}*SharedItemsImports = 5
+		Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{5a7671d6-57a1-4422-9ebb-79f3c724c0ba}*SharedItemsImports = 5
+		Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{5bab09dc-b0fc-4004-9fd5-6496a9634071}*SharedItemsImports = 13
+		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{5bbde14e-50f8-4d6e-8e35-747667ad4a09}*SharedItemsImports = 13
+		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{62e992b6-2e65-4714-ad37-42f34f9bd5da}*SharedItemsImports = 5
+		Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{63b3f901-7c14-4530-8a6f-ccad68586664}*SharedItemsImports = 5
+		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{79aa475d-7cde-4501-90ce-9a0d9d0db023}*SharedItemsImports = 5
+		Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{7ffdab72-145d-4490-9892-fac5f1d72b17}*SharedItemsImports = 13
+		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{90362309-466a-482b-814a-adb1ce227607}*SharedItemsImports = 5
+		Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{adc53dc0-0592-4f13-b456-65adcb2164a1}*SharedItemsImports = 5
+		Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13
+		Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b9649e07-f7b4-4fcc-9e44-076993621d0a}*SharedItemsImports = 5
+		Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{bc110327-3c61-4c15-ae4c-daae7ca82a7b}*SharedItemsImports = 5
+		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{bf5515b4-c97c-4fb9-9f93-1740d2b615b3}*SharedItemsImports = 5
+		Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{d8cdf95e-f72d-4f3e-8026-b82863f97d64}*SharedItemsImports = 5
+		Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{dd4add16-65f9-46e0-a610-2b7908a966b3}*SharedItemsImports = 5
+		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{df4d24c3-2be8-476c-8d40-33892be07b1d}*SharedItemsImports = 5
+		Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{e4006179-462f-4133-9481-219279138b93}*SharedItemsImports = 5
+		Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{f00b2895-b912-432d-a504-99a82e07d9d4}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal
diff --git a/Objects/Objects/BuiltElements/Archicad/BeamComponents.cs b/Objects/Objects/BuiltElements/Archicad/BeamComponents.cs
deleted file mode 100644
index 37dd32cf5a..0000000000
--- a/Objects/Objects/BuiltElements/Archicad/BeamComponents.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using Speckle.Newtonsoft.Json;
-using Speckle.Core.Kits;
-using Speckle.Core.Models;
-using System.Collections.Generic;
-using Objects.Other;
-
-namespace Objects.BuiltElements.Archicad
-{
-    public class Segment : Base
-    {
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public bool circleBased { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public string modelElemStructureType { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double nominalHeight { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double nominalWidth { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public bool isHomogeneous { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double endWith { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double endHeight { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public bool isEndWidthAndHeightLinked { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public bool isWidthAndHeightLinked { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public string profileAttrName { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public string buildingMaterial { get; set; }
-    }
-
-    public class Scheme : Base
-    {
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public string lengthType { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double fixedLength { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double lengthProportion { get; set; }
-    }
-
-    public class Cut : Base
-    {
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public string cutType { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double customAngle { get; set; }
-    }
-
-    public class Hole : Base
-    {
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public string holeType { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public bool holeContourOn { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public System.Int32 holeId { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double centerx { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double centerz { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double width { get; set; }
-
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public double height { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Objects/Objects/BuiltElements/Archicad/Fenestration.cs b/Objects/Objects/BuiltElements/Archicad/Fenestration.cs
new file mode 100644
index 0000000000..9a716fd79b
--- /dev/null
+++ b/Objects/Objects/BuiltElements/Archicad/Fenestration.cs
@@ -0,0 +1,45 @@
+using Objects.Geometry;
+using Speckle.Core.Kits;
+using Speckle.Core.Models;
+using System;
+using System.Collections.Generic;
+
+namespace Objects.BuiltElements.Archicad
+{
+  public class ArchicadFenestration : Base, IDisplayValue<List<Mesh>>
+    {
+    [DetachProperty]
+    public List<Mesh> displayValue { get; set; }
+
+    public string parentApplicationId { get; set; }
+
+    public double width { get; set; }
+    public double height { get; set; }
+    public double subFloorThickness { get; set; }
+    public bool reflected { get; set; }
+    public bool oSide { get; set; }
+    public bool refSide { get; set; }
+
+    public string buildingMaterial { get; set; }
+    public string libraryPart { get; set; }
+
+    public double revealDepthFromSide { get; set; }
+    public double jambDepthHead { get; set; }
+    public double jambDepth { get; set; }
+    public double jambDepth2 { get; set; }
+    public double objLoc { get; set; }
+    public double lower { get; set; }
+    public string directionType { get; set; }
+
+    public Point startPoint { get; set; }
+    public Point dirVector { get; set; }
+  }
+
+  public sealed class ArchicadDoor : ArchicadFenestration
+  {
+  }
+
+  public sealed class ArchicadWindow : ArchicadFenestration
+  {
+  }
+}
\ No newline at end of file
diff --git a/Objects/Objects/BuiltElements/Archicad/Floor.cs b/Objects/Objects/BuiltElements/Archicad/Floor.cs
deleted file mode 100644
index f6233f5e84..0000000000
--- a/Objects/Objects/BuiltElements/Archicad/Floor.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using Objects.Geometry;
-using Speckle.Core.Models;
-using Speckle.Newtonsoft.Json;
-
-namespace Objects.BuiltElements.Archicad
-{
-  public sealed class Floor : BuiltElements.Floor
-  {
-    public ElementShape shape { get; set; }
-
-    public int? floorIndex { get; set; }
-
-    public string structure { get; set; }
-
-    public double? thickness { get; set; }
-
-    public string edgeAngleType { get; set; }
-
-    public double? edgeAngle { get; set; }
-
-    public string referencePlaneLocation { get; set; }
-
-    public int? compositeIndex { get; set; }
-
-    public int? buildingMaterialIndex { get; set; }
-
-    public Floor() { }
-  }
-}
diff --git a/Objects/Objects/BuiltElements/Archicad/Room.cs b/Objects/Objects/BuiltElements/Archicad/Room.cs
deleted file mode 100644
index 17d1af7d30..0000000000
--- a/Objects/Objects/BuiltElements/Archicad/Room.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using Objects.Geometry;
-using Speckle.Core.Models;
-using Speckle.Newtonsoft.Json;
-
-namespace Objects.BuiltElements.Archicad
-{
-  public class Room : BuiltElements.Room
-  {
-    public int? floorIndex { get; set; }
-
-    public double height { get; set; }
-
-    public ElementShape shape { get; set; }
-
-    public Room() { }
-  }
-}
diff --git a/Objects/Objects/BuiltElements/Archicad/SubElementData.cs b/Objects/Objects/BuiltElements/Archicad/SubElementData.cs
new file mode 100644
index 0000000000..c4e7ad8559
--- /dev/null
+++ b/Objects/Objects/BuiltElements/Archicad/SubElementData.cs
@@ -0,0 +1,13 @@
+using Speckle.Core.Models;
+using Objects.Geometry;
+using System.Collections.Generic;
+
+
+namespace Objects.BuiltElements.Archicad
+{
+  public sealed class SubElementData
+  {
+    public string applicationId { get; set; }
+    public string elementType { get; set; }
+  }
+}
diff --git a/Objects/Objects/BuiltElements/Archicad/Wall.cs b/Objects/Objects/BuiltElements/Archicad/Wall.cs
deleted file mode 100644
index f54a129cb2..0000000000
--- a/Objects/Objects/BuiltElements/Archicad/Wall.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using Objects.Geometry;
-using Speckle.Core.Kits;
-using Speckle.Core.Models;
-using Speckle.Newtonsoft.Json;
-
-namespace Objects.BuiltElements.Archicad
-{
-	public sealed class Wall : BuiltElements.Wall
-	{
-		public int? floorIndex { get; set; }
-
-		public Point startPoint { get; set; }
-
-		public Point endPoint { get; set; }
-
-		public double? arcAngle { get; set; }
-
-		public string structure { get; set; }
-
-		public string geometryMethod { get; set; }
-
-		public string wallComplexity { get; set; }
-
-		public double? thickness { get; set; }
-
-		public double? outsideSlantAngle { get; set; }
-
-		public int? compositeIndex { get; set; }
-
-		public int? buildingMaterialIndex { get; set; }
-
-		public int? profileIndex { get; set; }
-
-		public double baseOffset { get; set; }
-
-		public double? topOffset { get; set; }
-
-		public bool flipped { get; set; }
-
-		public Wall() { }
-
-		public Wall(Point startPoint, Point endPoint, double height, bool flipped = false)
-		{
-			this.startPoint = startPoint;
-			this.endPoint = endPoint;
-			this.height = height;
-			this.flipped = flipped;
-		}
-	}
-}
diff --git a/Objects/Objects/BuiltElements/Beam.cs b/Objects/Objects/BuiltElements/Beam.cs
index 75a6669e58..8910a08a10 100644
--- a/Objects/Objects/BuiltElements/Beam.cs
+++ b/Objects/Objects/BuiltElements/Beam.cs
@@ -108,6 +108,90 @@ public SpiralBeam()
   }
 }
 
+namespace Objects.BuiltElements.Archicad
+{
+  public class Segment : Base
+  {
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public bool circleBased { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public string modelElemStructureType { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double nominalHeight { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double nominalWidth { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public bool isHomogeneous { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double endWith { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double endHeight { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public bool isEndWidthAndHeightLinked { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public bool isWidthAndHeightLinked { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public string profileAttrName { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public string buildingMaterial { get; set; }
+  }
+
+  public class Scheme : Base
+  {
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public string lengthType { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double fixedLength { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double lengthProportion { get; set; }
+  }
+
+  public class Cut : Base
+  {
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public string cutType { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double customAngle { get; set; }
+  }
+
+  public class Hole : Base
+  {
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public string holeType { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public bool holeContourOn { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public System.Int32 holeId { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double centerx { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double centerz { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double width { get; set; }
+
+    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    public double height { get; set; }
+  }
+}
+
 namespace Objects.BuiltElements.Archicad
 {
     public class ArchicadBeam : Objects.BuiltElements.Beam
diff --git a/Objects/Objects/BuiltElements/Conduit.cs b/Objects/Objects/BuiltElements/Conduit.cs
new file mode 100644
index 0000000000..5ef4ba261a
--- /dev/null
+++ b/Objects/Objects/BuiltElements/Conduit.cs
@@ -0,0 +1,43 @@
+using System;
+using Objects.Geometry;
+using Objects.Utils;
+using Speckle.Core.Kits;
+using Speckle.Core.Models;
+using System.Collections.Generic;
+using System.Linq;
+using Speckle.Newtonsoft.Json;
+
+namespace Objects.BuiltElements
+{
+  public class Conduit : Base, IDisplayValue<List<Mesh>>
+  {
+    public ICurve baseCurve { get; set; }
+    public double diameter { get; set; }
+    public double length { get; set; }
+
+    [DetachProperty]
+    public List<Mesh> displayValue { get; set; }
+
+    public string units { get; set; }
+
+    public Conduit() { }
+  }
+}
+
+namespace Objects.BuiltElements.Revit
+{
+  public class RevitConduit : Conduit
+  {
+    public string family { get; set; }
+
+    public string type { get; set; }
+
+    public Level level { get; set; }
+
+    public Base parameters { get; set; }
+
+    public string elementId { get; set; }
+
+    public RevitConduit() { }
+  }
+}
diff --git a/Objects/Objects/BuiltElements/Floor.cs b/Objects/Objects/BuiltElements/Floor.cs
index 8a96697c08..79d58143d3 100644
--- a/Objects/Objects/BuiltElements/Floor.cs
+++ b/Objects/Objects/BuiltElements/Floor.cs
@@ -67,4 +67,31 @@ public RevitFloor(string family, string type, [SchemaMainParam] ICurve outline,
       this.elements = elements;
     }
   }
+}
+
+
+namespace Objects.BuiltElements.Archicad
+{
+  public sealed class ArchicadFloor : BuiltElements.Floor
+  {
+    public ElementShape shape { get; set; }
+
+    public int? floorIndex { get; set; }
+
+    public string structure { get; set; }
+
+    public double? thickness { get; set; }
+
+    public string edgeAngleType { get; set; }
+
+    public double? edgeAngle { get; set; }
+
+    public string referencePlaneLocation { get; set; }
+
+    public int? compositeIndex { get; set; }
+
+    public int? buildingMaterialIndex { get; set; }
+
+    public ArchicadFloor() { }
+  }
 }
\ No newline at end of file
diff --git a/Objects/Objects/BuiltElements/Network.cs b/Objects/Objects/BuiltElements/Network.cs
new file mode 100644
index 0000000000..e6429c5d3c
--- /dev/null
+++ b/Objects/Objects/BuiltElements/Network.cs
@@ -0,0 +1,153 @@
+using Objects.Geometry;
+using Speckle.Core.Kits;
+using Speckle.Core.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using Speckle.Newtonsoft.Json;
+using Objects.BuiltElements;
+
+namespace Objects.BuiltElements
+{
+  /// <summary>
+  /// Represents graph connections between built elements objects
+  /// </summary>
+  /// <remarks>
+  /// Network <see cref="elements"/> may need to be created first in native applications before they are linked.
+  /// </remarks>
+  public class Network : Base
+  {
+    public string name { get; set; }
+
+    /// <summary>
+    /// The elements contained in the network
+    /// </summary>
+    public List<NetworkElement> elements { get; set; }
+
+    /// <summary>
+    /// The connections between <see cref="elements"/>
+    /// </summary>
+    public List<NetworkLink> links { get; set; }
+
+    public Network() { }
+  }
+
+  public class NetworkElement : Base
+  {
+    public string name { get; set; }
+
+    [DetachProperty]
+    /// <summary>
+    /// The Base object representing the element in the network (eg Pipe, Duct, etc)
+    /// </summary>
+    /// <remarks>
+    /// Currently named "elements" to assist with receiving in connector flatten method.
+    /// </remarks>
+    public Base elements { get; set; } 
+
+    /// <summary>
+    /// The index of the links in <see cref="network"/> that are connected to this element
+    /// </summary>
+    public List<int> linkIndices { get; set; }
+
+    [JsonIgnore] 
+    public Network network { get; set; }
+
+    public NetworkElement() { }
+
+    /// <summary>
+    /// Retrieves the links for this element
+    /// </summary>
+    [JsonIgnore] public List<NetworkLink> links => linkIndices.Select(i => network?.links[i]).ToList();
+  }
+
+  public class NetworkLink : Base
+  {
+    public string name { get; set; }
+
+    /// <summary>
+    /// The index of the elements in <see cref="network"/> that are connected by this link
+    /// </summary>
+    public List<int> elementIndices { get; set; }
+
+    [JsonIgnore] 
+    public Network network { get; set; }
+
+    public NetworkLink() { }
+
+    /// <summary>
+    /// Retrieves the elements for this link
+    /// </summary>
+    [JsonIgnore] public List<NetworkElement> elements => elementIndices.Select(i => network?.elements[i]).ToList();
+  }
+}
+
+namespace Objects.BuiltElements.Revit
+{
+  public class RevitNetworkElement : NetworkElement
+  {
+    /// <summary>
+    /// Indicates if this element was constructed from an MEP curve
+    /// </summary>
+    public bool isCurveBased { get; set; }
+
+    /// <summary>
+    /// Indicates if this element needs temporary placeholder objects to be created first when receiving
+    /// </summary>
+    /// <remarks>
+    /// For example, some fittings cannot be created based on connectors, and so will be created similarly to mechanical equipment
+    /// </remarks>
+    public bool isConnectorBased { get; set; }
+
+    public RevitNetworkElement() { }
+  }
+  public class RevitNetworkLink : NetworkLink
+  {
+    public double height { get; set; }
+    public double width { get; set; }
+    public double diameter { get; set; }
+    public Point origin { get; set; }
+    public Vector direction { get; set; }
+    /// <summary>
+    /// The system category
+    /// </summary>
+    public string systemName { get; set; }
+    public string systemType { get; set; }
+
+    /// <summary>
+    /// The connector profile shape of the <see cref="NetworkLink"/>
+    /// </summary>
+    public string shape { get; set; }
+
+    /// <summary>
+    /// The link domain
+    /// </summary>
+    public string domain { get; set; }
+
+    /// <summary>
+    /// The index indicating the position of this link on the connected fitting element, if applicable
+    /// </summary>
+    /// <remarks>
+    /// Revit fitting links are 1-indexed. For example, "T" fittings will have ordered links from index 1-3.
+    /// </remarks>
+    public int fittingIndex { get; set; }
+
+    /// <summary>
+    /// Indicates if this link needs temporary placeholder objects to be created first when receiving
+    /// </summary>
+    /// <remarks> 
+    /// Placeholder geometry are curves. 
+    /// For example, U-bend links need temporary pipes to be created first, if one or more linked pipes have not yet been created in the network.
+    /// </remarks>
+    public bool needsPlaceholders { get; set; }
+
+    /// <summary>
+    /// Indicates if this link has been connected to its elements
+    /// </summary>
+    public bool isConnected { get; set; }
+
+    public RevitNetworkLink() { }
+  }
+}
diff --git a/Objects/Objects/BuiltElements/Opening.cs b/Objects/Objects/BuiltElements/Opening.cs
index 315cda2602..25750da22e 100644
--- a/Objects/Objects/BuiltElements/Opening.cs
+++ b/Objects/Objects/BuiltElements/Opening.cs
@@ -130,4 +130,4 @@ public class TeklaBeamOpening : TeklaOpening
         public TeklaBeam cuttingBeam { get; set; }
         public TeklaBeamOpening() { }
     }
-}
+}
\ No newline at end of file
diff --git a/Objects/Objects/BuiltElements/Revit/FamilyInstance.cs b/Objects/Objects/BuiltElements/Revit/FamilyInstance.cs
index 19f8badf6a..82f929bbc7 100644
--- a/Objects/Objects/BuiltElements/Revit/FamilyInstance.cs
+++ b/Objects/Objects/BuiltElements/Revit/FamilyInstance.cs
@@ -1,4 +1,3 @@
-using System;
 using Objects.Geometry;
 using Objects.Utils;
 using Speckle.Core.Kits;
diff --git a/Objects/Objects/BuiltElements/Revit/RevitElementType.cs b/Objects/Objects/BuiltElements/Revit/RevitElementType.cs
index 90bc2bcec8..5872280194 100644
--- a/Objects/Objects/BuiltElements/Revit/RevitElementType.cs
+++ b/Objects/Objects/BuiltElements/Revit/RevitElementType.cs
@@ -9,6 +9,8 @@ public class RevitElementType : Base
     public string family { get; set; }
     public string type { get; set; }
     public string category { get; set; }
+    public string placementType { get; set; }
+    public bool hasFamilySymbol { get; set; }
 
   }
 
diff --git a/Objects/Objects/BuiltElements/Room.cs b/Objects/Objects/BuiltElements/Room.cs
index 5ed541ec99..824a246e2b 100644
--- a/Objects/Objects/BuiltElements/Room.cs
+++ b/Objects/Objects/BuiltElements/Room.cs
@@ -56,3 +56,17 @@ public Room(string name, string number, Level level, [SchemaMainParam] Point bas
     }
   }
 }
+
+namespace Objects.BuiltElements.Archicad
+{
+  public class ArchicadRoom : BuiltElements.Room
+  {
+    public int? floorIndex { get; set; }
+
+    public double height { get; set; }
+
+    public ElementShape shape { get; set; }
+
+    public ArchicadRoom() { }
+  }
+}
\ No newline at end of file
diff --git a/Objects/Objects/BuiltElements/Wall.cs b/Objects/Objects/BuiltElements/Wall.cs
index e61b2bcbfa..0570715651 100644
--- a/Objects/Objects/BuiltElements/Wall.cs
+++ b/Objects/Objects/BuiltElements/Wall.cs
@@ -217,4 +217,52 @@ public RevitProfileWall(string family, string type,
   //   [SchemaIgnore]
   //   public string elementId { get; set; }
   // }
+}
+
+
+namespace Objects.BuiltElements.Archicad
+{
+  public class ArchicadWall : Objects.BuiltElements.Wall
+  {
+    public int? floorIndex { get; set; }
+
+    public Point startPoint { get; set; }
+
+    public Point endPoint { get; set; }
+
+    public double? arcAngle { get; set; }
+
+    public string structure { get; set; }
+
+    public string geometryMethod { get; set; }
+
+    public string wallComplexity { get; set; }
+
+    public double? thickness { get; set; }
+
+    public double? outsideSlantAngle { get; set; }
+
+    public int? compositeIndex { get; set; }
+
+    public int? buildingMaterialIndex { get; set; }
+
+    public int? profileIndex { get; set; }
+
+    public double baseOffset { get; set; }
+
+    public double? topOffset { get; set; }
+
+    public bool flipped { get; set; }
+    public bool hasWindow { get; set; }
+    public bool hasDoor { get; set; }
+    public ArchicadWall() { }
+    public ArchicadWall(Point startPoint, Point endPoint, double height, bool flipped = false)
+    {
+      this.startPoint = startPoint;
+      this.endPoint = endPoint;
+      this.height = height;
+      this.flipped = flipped;
+    }
+  }
+
 }
\ No newline at end of file
diff --git a/Objects/Objects/Geometry/Arc.cs b/Objects/Objects/Geometry/Arc.cs
index d2f662d672..94da616b93 100644
--- a/Objects/Objects/Geometry/Arc.cs
+++ b/Objects/Objects/Geometry/Arc.cs
@@ -177,6 +177,8 @@ public Arc(Plane plane, Point startPoint, Point endPoint, double angleRadians, s
             else if (startPoint.x < circleCentre.x && startPoint.y > circleCentre.y) // Q2
                 startAngle = Math.PI - startAngle;
             endAngle = startAngle + angleRadians;
+            // Set the plane of this arc
+            this.plane = plane;
         }
         
         /// <summary>
diff --git a/Objects/Objects/Geometry/Point.cs b/Objects/Objects/Geometry/Point.cs
index e0f12aa7d2..688bc48a12 100644
--- a/Objects/Objects/Geometry/Point.cs
+++ b/Objects/Objects/Geometry/Point.cs
@@ -190,6 +190,18 @@ public bool TransformTo(Transform transform, out Point point)
     public static double Distance(Point point1, Point point2) => Math.Sqrt(
       Math.Pow(point1.x - point2.x, 2) + Math.Pow(point1.y - point2.y, 2) + Math.Pow(point1.z - point2.z, 2));
     
+    /// <summary>
+    /// Computes the distance between two points.
+    /// </summary>
+    /// <param name="point">point for distance measurement</param>
+    /// <returns>The length of the line between this and the other point</returns>
+    public double DistanceTo(Point point)
+    {
+      return Math.Sqrt(Math.Pow((x - point.x), 2) +
+                       Math.Pow((y - point.y), 2) +
+                       Math.Pow((z - point.z), 2));
+    }
+    
     /// <inheritdoc/>
     public bool TransformTo(Transform transform, out ITransformable transformed)
     {
diff --git a/Objects/Objects/ObjectsKit.cs b/Objects/Objects/ObjectsKit.cs
index 0ceb524447..ceafe27294 100644
--- a/Objects/Objects/ObjectsKit.cs
+++ b/Objects/Objects/ObjectsKit.cs
@@ -1,4 +1,5 @@
 
+using Speckle.Core.Api;
 using Speckle.Core.Kits;
 using Speckle.Core.Logging;
 using Speckle.Core.Models;
@@ -17,16 +18,37 @@ public class ObjectsKit : ISpeckleKit
   {
     /// <inheritdoc/>
     public string Description => "The default Speckle Kit.";
-    
+
     /// <inheritdoc/>
     public string Name => "Objects";
-    
+
     /// <inheritdoc/>
     public string Author => "Speckle";
-    
+
     /// <inheritdoc/>
     public string WebsiteOrEmail => "https://speckle.systems";
 
+    private static string _objectsFolder = null;
+
+    /// <summary>
+    /// Local installations store objects in C:\Users\USERNAME\AppData\Roaming\Speckle\Kits\Objects
+    /// Admin/System-wide installations in C:\ProgramData\Speckle\Kits\Objects
+    /// </summary>
+    public static string ObjectsFolder
+    {
+      get
+      {
+        if (_objectsFolder == null)
+          _objectsFolder = Path.Combine(Helpers.InstallSpeckleFolderPath, "Kits", "Objects");
+
+        return _objectsFolder;
+      }
+      set
+      {
+        _objectsFolder = value;
+      }
+    }
+
     /// <inheritdoc/>
     public IEnumerable<Type> Types
     {
@@ -81,6 +103,14 @@ public ISpeckleConverter LoadConverter(string app)
         var basePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
         var path = Path.Combine(basePath, $"Objects.Converter.{app}.dll");
+
+        //fallback to the default folder, in case the Objects.dll was loaded in the app domain for other reasons
+        if (!File.Exists(path))
+        {
+          path = Path.Combine(ObjectsFolder, $"Objects.Converter.{app}.dll");
+        }
+
+
         if (File.Exists(path))
         {
           var assembly = Assembly.LoadFrom(path);
@@ -110,8 +140,16 @@ public List<string> GetAvailableConverters()
     {
       var basePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
       var list = Directory.EnumerateFiles(basePath, "Objects.Converter.*");
+      var availableConverters = list.ToList().Select(dllPath => dllPath.Split('.').Reverse().ToList()[1]).ToList();
+
+      //fallback to the default folder, in case the Objects.dll was loaded in the app domain for other reasons
+      if (!availableConverters.Any())
+      {
+        list = Directory.EnumerateFiles(ObjectsFolder, "Objects.Converter.*");
+        availableConverters = list.ToList().Select(dllPath => dllPath.Split('.').Reverse().ToList()[1]).ToList();
+      }
 
-      return list.ToList().Select(dllPath => dllPath.Split('.').Reverse().ToList()[1]).ToList();
+      return availableConverters;
     }
   }
 }
diff --git a/Objects/Objects/Other/Transform.cs b/Objects/Objects/Other/Transform.cs
index f66a48aa7a..a7bd2006da 100644
--- a/Objects/Objects/Other/Transform.cs
+++ b/Objects/Objects/Other/Transform.cs
@@ -1,11 +1,14 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Objects.Geometry;
+using Objects.Geometry;
 using Speckle.Core.Kits;
 using Speckle.Core.Logging;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using Vector = Objects.Geometry.Vector;
 
 namespace Objects.Other
 {
@@ -18,31 +21,57 @@ namespace Objects.Other
   /// </remarks>
   public class Transform : Base
   {
-    public double[ ] value { get; set; } = { 1d, 0d, 0d, 0d,
+    public double[] value { get; set; } = { 1d, 0d, 0d, 0d,
                                              0d, 1d, 0d, 0d,
                                              0d, 0d, 1d, 0d,
                                              0d, 0d, 0d, 1d };
 
     public string units { get; set; }
 
-    [JsonIgnore] public double[ ] translation => value.Subset(3, 7, 11, 15);
+    [JsonIgnore]
+    public double[] translation => value.Subset(3, 7, 11, 15);
+
+    [JsonIgnore]
+    public double rotationZ
+    {
+
+      get
+      {
+
+        var matrix = new Matrix4x4(
+      (float)value[0], (float)value[1], (float)value[2], (float)value[3],
+      (float)value[4], (float)value[5], (float)value[6], (float)value[7],
+      (float)value[8], (float)value[9], (float)value[10], (float)value[11],
+      (float)value[12], (float)value[13], (float)value[14], (float)value[15]);
+
+        if (Matrix4x4.Decompose(matrix, out Vector3 _scale, out Quaternion _rotation, out Vector3 _translation))
+        {
+          return Math.Acos(_rotation.W) * 2;
+        }
+        else
+        {
+          return 0;
+        }
+      }
+    }
+
 
-    [JsonIgnore] public double[ ] scaling => value.Subset(0, 1, 2, 4, 5, 6, 8, 9, 10);
+    [JsonIgnore] public double[] scaling => value.Subset(0, 1, 2, 4, 5, 6, 8, 9, 10);
 
     [JsonIgnore]
-    public bool isIdentity => value[ 0 ] ==  1d  && value[ 5 ] ==  1d  && value[ 10 ] ==  1d  && value[ 15 ] == 1d &&
-                              value[ 1 ] == 0d && value[ 2 ] == 0d && value[ 3 ] == 0d &&
-                              value[ 4 ] == 0d && value[ 6 ] == 0d && value[ 7 ] == 0d &&
-                              value[ 8 ] == 0d && value[ 9 ] == 0d && value[ 11 ] == 0d &&
-                              value[ 12 ] == 0d && value[ 13 ] == 0d && value[ 14 ] == 0d;
+    public bool isIdentity => value[0] == 1d && value[5] == 1d && value[10] == 1d && value[15] == 1d &&
+                              value[1] == 0d && value[2] == 0d && value[3] == 0d &&
+                              value[4] == 0d && value[6] == 0d && value[7] == 0d &&
+                              value[8] == 0d && value[9] == 0d && value[11] == 0d &&
+                              value[12] == 0d && value[13] == 0d && value[14] == 0d;
 
-    [JsonIgnore] public bool isScaled => !( value[ 0 ] == 1d  && value[ 5 ] ==  1d  && value[ 10 ] ==  1d );
+    [JsonIgnore] public bool isScaled => !(value[0] == 1d && value[5] == 1d && value[10] == 1d);
 
     public Transform()
     {
     }
 
-    public Transform(double[ ] value, string units = null)
+    public Transform(double[] value, string units = null)
     {
       this.value = value;
       this.units = units;
@@ -56,10 +85,10 @@ public Transform(double[ ] value, string units = null)
     /// <param name="z"></param>
     /// <param name="translation"></param>
     /// <param name="units"></param>
-    public Transform(double[ ] x, double[ ] y, double[ ] z, double[ ] translation, string units = null)
+    public Transform(double[] x, double[] y, double[] z, double[] translation, string units = null)
     {
       this.units = units;
-      value = new[ ]
+      value = new[]
       {
         x[ 0 ], y[ 0 ], z[ 0 ], translation[ 0 ],
         x[ 1 ], y[ 1 ], z[ 1 ], translation[ 1 ],
@@ -74,7 +103,7 @@ public Transform(double[ ] x, double[ ] y, double[ ] z, double[ ] translation, s
     /// <param name="scaling">The 3x3 sub-matrix</param>
     /// <param name="translation">The last column of the matrix (the last element being the divisor which is almost always 1)</param>
     /// <param name="units"></param>
-    public void Deconstruct(out double[ ] scaling, out double[ ] translation, out string units)
+    public void Deconstruct(out double[] scaling, out double[] translation, out string units)
     {
       scaling = this.scaling;
       translation = this.translation;
@@ -86,12 +115,12 @@ public void Deconstruct(out double[ ] scaling, out double[ ] translation, out st
     /// </summary>
     public List<double> ApplyToPoints(List<double> points)
     {
-      if ( points.Count % 3 != 0 )
+      if (points.Count % 3 != 0)
         throw new SpeckleException(
           $"Cannot apply transform as the points list is malformed: expected length to be multiple of 3");
       var transformed = new List<double>(points.Count);
-      for ( var i = 0; i < points.Count; i += 3 )
-        transformed.AddRange(ApplyToPoint(new List<double>(3) { points[ i ], points[ i + 1 ], points[ i + 2 ] }));
+      for (var i = 0; i < points.Count; i += 3)
+        transformed.AddRange(ApplyToPoint(new List<double>(3) { points[i], points[i + 1], points[i + 2] }));
 
       return transformed;
     }
@@ -102,8 +131,8 @@ public List<double> ApplyToPoints(List<double> points)
     public List<Point> ApplyToPoints(List<Point> points)
     {
       var transformed = new List<Point>(points.Count);
-      for ( var i = 0; i < points.Count; i++ )
-        transformed.Add(ApplyToPoint(points[ i ]));
+      for (var i = 0; i < points.Count; i++)
+        transformed.Add(ApplyToPoint(points[i]));
 
       return transformed;
     }
@@ -116,7 +145,7 @@ public Point ApplyToPoint(Point point)
     {
       var (x, y, z, units) = point;
       var newCoords = ApplyToPoint(new List<double> { x, y, z });
-      return new Point(newCoords[ 0 ], newCoords[ 1 ], newCoords[ 2 ], point.units, point.applicationId);
+      return new Point(newCoords[0], newCoords[1], newCoords[2], point.units, point.applicationId);
     }
 
     /// <summary>
@@ -125,9 +154,9 @@ public Point ApplyToPoint(Point point)
     public List<double> ApplyToPoint(List<double> point)
     {
       var transformed = new List<double>();
-      for ( var i = 0; i < 16; i += 4 )
-        transformed.Add(point[ 0 ] * value[ i ] + point[ 1 ] * value[ i + 1 ] + point[ 2 ] * value[ i + 2 ] +
-                        value[ i + 3 ]);
+      for (var i = 0; i < 16; i += 4)
+        transformed.Add(point[0] * value[i] + point[1] * value[i + 1] + point[2] * value[i + 2] +
+                        value[i + 3]);
 
       return new List<double>(3)
       {
@@ -142,7 +171,7 @@ public Vector ApplyToVector(Vector vector)
     {
       var newCoords = ApplyToVector(new List<double> { vector.x, vector.y, vector.z });
 
-      return new Geometry.Vector(newCoords[ 0 ], newCoords[ 1 ], newCoords[ 2 ], vector.units, vector.applicationId);
+      return new Geometry.Vector(newCoords[0], newCoords[1], newCoords[2], vector.units, vector.applicationId);
     }
 
     /// <summary>
@@ -150,11 +179,11 @@ public Vector ApplyToVector(Vector vector)
     /// </summary>
     public List<double> ApplyToVector(List<double> vector)
     {
-      var newPoint = new List<double>(4) {vector[ 0 ], vector[ 1 ], vector[ 2 ], 1};
+      var newPoint = new List<double>(4) { vector[0], vector[1], vector[2], 1 };
 
-      for ( var i = 0; i < 16; i += 4 )
-        newPoint[ i / 4 ] = newPoint[ 0 ] * value[ i ] + newPoint[ 1 ] * value[ i + 1 ] +
-                            newPoint[ 2 ] * value[ i + 2 ];
+      for (var i = 0; i < 16; i += 4)
+        newPoint[i / 4] = newPoint[0] * value[i] + newPoint[1] * value[i + 1] +
+                            newPoint[2] * value[i + 2];
 
       return new List<double>(3)
         { newPoint[ 0 ], newPoint[ 1 ], newPoint[ 2 ] };
@@ -168,12 +197,12 @@ public List<ICurve> ApplyToCurves(List<ICurve> curves, out bool success)
     {
       success = true;
       var transformed = new List<ICurve>();
-      foreach ( var curve in curves )
+      foreach (var curve in curves)
       {
-        if ( curve is ITransformable c )
+        if (curve is ITransformable c)
         {
           c.TransformTo(this, out ITransformable tc);
-          transformed.Add(( ICurve )tc);
+          transformed.Add((ICurve)tc);
         }
         else
           success = false;
@@ -190,16 +219,16 @@ public List<ICurve> ApplyToCurves(List<ICurve> curves, out bool success)
     /// <returns></returns>
     public static Transform operator *(Transform t1, Transform t2)
     {
-      var result = new double[ 16 ];
+      var result = new double[16];
       var row = 0;
-      for ( var i = 0; i < 16; i += 4 )
+      for (var i = 0; i < 16; i += 4)
       {
-        for ( var j = 0; j < 4; j++ )
+        for (var j = 0; j < 4; j++)
         {
-          result[ i + j ] = t1.value[ i ] * t2.value[ j ] +
-                            t1.value[ i + 1 ] * t2.value[ j + 4 ] +
-                            t1.value[ i + 2 ] * t2.value[ j + 8 ] +
-                            t1.value[ i + 3 ] * t2.value[ j + 12 ];
+          result[i + j] = t1.value[i] * t2.value[j] +
+                            t1.value[i + 1] * t2.value[j + 4] +
+                            t1.value[i + 2] * t2.value[j + 8] +
+                            t1.value[i + 3] * t2.value[j + 12];
         }
       }
 
@@ -210,12 +239,12 @@ t1.value[ i + 2 ] * t2.value[ j + 8 ] +
   static class ArrayUtils
   {
     // create a subset from a specific list of indices
-    public static T[ ] Subset<T>(this T[ ] array, params int[ ] indices)
+    public static T[] Subset<T>(this T[] array, params int[] indices)
     {
-      var subset = new T[ indices.Length ];
-      for ( var i = 0; i < indices.Length; i++ )
+      var subset = new T[indices.Length];
+      for (var i = 0; i < indices.Length; i++)
       {
-        subset[ i ] = array[ indices[ i ] ];
+        subset[i] = array[indices[i]];
       }
 
       return subset;
diff --git a/Objects/Tests/Geometry/ArcTests.cs b/Objects/Tests/Geometry/ArcTests.cs
new file mode 100644
index 0000000000..0ba70f7dc8
--- /dev/null
+++ b/Objects/Tests/Geometry/ArcTests.cs
@@ -0,0 +1,36 @@
+using System;
+using NUnit.Framework;
+using NUnit.Framework.Internal;
+using Objects.Geometry;
+
+namespace Tests.Geometry
+{
+  [TestFixture, TestOf(typeof(Arc))]
+
+  public class ArcTests
+  {
+    public Plane TestPlane =>  new (
+    new Point(0,0),
+    new Vector(0,0,1),
+    new Vector(1,0,0),
+    new Vector(0,1,0)
+      );
+    
+    [Test]
+    public void CanCreateArc_HalfCircle()
+    {
+      var arc = new Arc(
+        TestPlane,
+        new Point(-5,5),
+        new Point(5,5),
+        Math.PI
+      );
+
+      Assert.AreEqual(arc.startAngle, 0);
+      Assert.AreEqual(arc.endAngle, Math.PI);
+      
+      Assert.True(Point.Distance(arc.midPoint, new Point(0,0)) <= 0.0001);
+      Assert.True(Point.Distance(arc.plane.origin, new Point(0,5)) <= 0.0001);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Objects/Tests/Tests.csproj b/Objects/Tests/Tests.csproj
index a9075eed9b..0242c9d37b 100644
--- a/Objects/Tests/Tests.csproj
+++ b/Objects/Tests/Tests.csproj
@@ -9,7 +9,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="NUnit" Version="3.13.1" />
-        <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
         <PackageReference Include="coverlet.collector" Version="3.0.2" />
         <PackageReference Include="JunitXml.TestLogger" Version="3.0.114" />
     </ItemGroup>