Fix build (#94 )

Update README.md (#93 )
Added support for Unreal 5.4 (#92 )
2024-05-09 16:54:46 +01:00 · 2024-05-09 15:32:21 +01:00 · 2024-05-08 14:34:58 +01:00 · 2024-05-08 14:34:46 +01:00 · 2024-05-08 14:34:34 +01:00 · 2024-05-07 22:52:14 +01:00
135 changed files with 2496 additions and 2327 deletions
@@ -0,0 +1,111 @@
+version: 2.1
+
+orbs:
+  aws-s3: circleci/aws-s3@2.0.0
+
+parameters:
+  marketplace-deploy:
+    type: boolean
+    default: false 
+
+commands:
+  zip-source:
+    parameters:
+      target:
+        type: string
+      outputdir:
+        type: string
+    steps:
+      - run:
+          name: "Create Archive"
+          command: |
+            \cp -r ".pluginconfig/<<parameters.target>>/." "./"
+            mkdir -p "<<parameters.outputdir>>/"
+            stashName=`git stash create`;
+            git archive -o "<<parameters.outputdir>>/speckle-unreal-UE<<parameters.target>>.zip" --worktree-attributes --prefix="speckle-unreal/" $stashName
+
+  add-source-copyright:
+    parameters:
+      copyright-string:
+        type: string
+    steps:
+      - run: #Remove BOM header, then add copyright comment
+          name: "Add copyright notice to source files"
+          command: |
+            shopt -s globstar
+            for file in Source/**/*.{cpp,hpp,c,h,cs};
+              do if [ -f $file ]; then
+                sed -i '1s/^\xEF\xBB\xBF//' $file;
+                sed -i '1s/^/\/\/ <<parameters.copyright-string>>\n/' $file;
+                echo "added copyright notice to $file";
+              fi;
+            done;
+
+jobs:
+  generate-source-zip:
+    docker:
+      - image: cimg/base:stable
+    parameters:
+      target:
+        type: string
+    steps:
+      - checkout
+      - add-source-copyright:
+          copyright-string: "Copyright AEC SYSTEMS 2023"
+      - zip-source:
+            target: <<parameters.target>>
+            outputdir: "output/unreal/<<parameters.target>>"
+      - store_artifacts:
+          path: "output/unreal/<<parameters.target>>"
+          destination: "unreal-marketplace/<<parameters.target>>"
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - "output/unreal/<<parameters.target>>"
+
+  marketplace-deploy:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - attach_workspace:
+          at: ./
+      - aws-s3/copy:
+          arguments: "--recursive --endpoint=https://$SPACES_REGION.digitaloceanspaces.com --acl public-read"
+          aws-access-key-id: SPACES_KEY
+          aws-region: SPACES_REGION
+          aws-secret-access-key: SPACES_SECRET
+          from: '"output"'
+          to: s3://speckle-releases/installers/
+
+workflows:
+  marketplace-publish:
+    when: <<pipeline.parameters.marketplace-deploy>>
+    jobs:
+      - generate-source-zip:
+          name: "Generate Source Archive UE4.27"
+          target: "4.27"
+      - generate-source-zip:
+          name: "Generate Source Archive UE5.0"
+          target: "5.0"
+      - generate-source-zip:
+          name: "Generate Source Archive UE5.1"
+          target: "5.1"      
+      - generate-source-zip:
+          name: "Generate Source Archive UE5.2"
+          target: "5.2"
+      - generate-source-zip:
+          name: "Generate Source Archive UE5.3"
+          target: "5.3"
+      - generate-source-zip:
+          name: "Generate Source Archive UE5.4"
+          target: "5.4"
+      - marketplace-deploy:
+          name: "Deploy to marketplace"
+          context: do-spaces-speckle-releases
+          requires: 
+            - "Generate Source Archive UE4.27"
+            - "Generate Source Archive UE5.0"
+            - "Generate Source Archive UE5.1"
+            - "Generate Source Archive UE5.2"
+            - "Generate Source Archive UE5.3"
+            - "Generate Source Archive UE5.4"
@@ -0,0 +1 @@
+.pluginconfig/* export-ignore
@@ -6,73 +6,7 @@ on:

 jobs:
  update_issue:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get project data
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ORGANIZATION: specklesystems
-          PROJECT_NUMBER: 9
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            query($org: String!, $number: Int!) {
-              organization(login: $org){
-                projectNext(number: $number) {
-                  id
-                  fields(first:20) {
-                    nodes {
-                      id
-                      name
-                      settings
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
-
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          
-          echo "$PROJECT_ID"
-          echo "$STATUS_FIELD_ID"
-          
-          echo 'DONE_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .settings | fromjson | .options[] | select(.name== "Done") | .id' project_data.json) >> $GITHUB_ENV
-          echo "$DONE_ID"
-
-      - name: Add Issue to project #it's already in the project, but we do this to get its node id!
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $id:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $id}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
-          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
-          
-      - name: Update Status
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $status:ID!, $id:ID!, $value:String!) {
-              set_status: updateProjectNextItemField(
-                input: {
-                  projectId: $project
-                  itemId: $id
-                  fieldId: $status
-                  value: $value
-                }
-              ) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f status=$STATUS_FIELD_ID -f id=$ITEM_ID -f value=${{ env.DONE_ID }}
-          
+    uses: specklesystems/github-actions/.github/workflows/project-add-issue.yml@main
+    secrets: inherit
+    with:
+      issue-id: ${{ github.event.issue.node_id }}
@@ -6,45 +6,7 @@ on:

 jobs:
  track_issue:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get project data
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ORGANIZATION: specklesystems
-          PROJECT_NUMBER: 9
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            query($org: String!, $number: Int!) {
-              organization(login: $org){
-                projectNext(number: $number) {
-                  id
-                  fields(first:20) {
-                    nodes {
-                      id
-                      name
-                      settings
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
-
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-     
-      - name: Add Issue to project
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $id:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $id}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
-          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
+    uses: specklesystems/github-actions/.github/workflows/project-add-issue.yml@main
+    secrets: inherit
+    with:
+      issue-id: ${{ github.event.issue.node_id }}
@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore
@@ -0,0 +1,42 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "2.19.0",
+	"FriendlyName": "Speckle Unreal",
+	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
+	"Category": "AEC",
+	"CreatedBy": "Speckle",
+	"CreatedByURL": "https://speckle.systems/",
+	"DocsURL": "https://github.com/specklesystems/speckle-unreal",
+	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81",
+	"SupportURL": "https://speckle.community/",
+	"CanContainContent": true,
+	"IsBetaVersion": true,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"EngineVersion": "4.27",
+	"Modules": [
+		{
+			"Name": "SpeckleUnreal",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		},
+		{
+			"Name": "SpeckleUnrealEditor",
+			"Type": "Editor",
+			"LoadingPhase": "PostEngineInit",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "LidarPointCloud",
+			"Enabled": true
+		}
+	]
+}
@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore
@@ -0,0 +1,42 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "2.19.0",
+	"FriendlyName": "Speckle Unreal",
+	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
+	"Category": "AEC",
+	"CreatedBy": "Speckle",
+	"CreatedByURL": "https://speckle.systems/",
+	"DocsURL": "https://github.com/specklesystems/speckle-unreal",
+	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81",
+	"SupportURL": "https://speckle.community/",
+	"CanContainContent": true,
+	"IsBetaVersion": true,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"EngineVersion": "5.0",
+	"Modules": [
+		{
+			"Name": "SpeckleUnreal",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		},
+		{
+			"Name": "SpeckleUnrealEditor",
+			"Type": "Editor",
+			"LoadingPhase": "PostEngineInit",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "LidarPointCloud",
+			"Enabled": true
+		}
+	]
+}
@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore
@@ -0,0 +1,42 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "2.19.0",
+	"FriendlyName": "Speckle Unreal",
+	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
+	"Category": "AEC",
+	"CreatedBy": "Speckle",
+	"CreatedByURL": "https://speckle.systems/",
+	"DocsURL": "https://github.com/specklesystems/speckle-unreal",
+	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81",
+	"SupportURL": "https://speckle.community/",
+	"CanContainContent": true,
+	"IsBetaVersion": true,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"EngineVersion": "5.1",
+	"Modules": [
+		{
+			"Name": "SpeckleUnreal",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		},
+		{
+			"Name": "SpeckleUnrealEditor",
+			"Type": "Editor",
+			"LoadingPhase": "PostEngineInit",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "LidarPointCloud",
+			"Enabled": true
+		}
+	]
+}
@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore
@@ -0,0 +1,42 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "2.19.0",
+	"FriendlyName": "Speckle Unreal",
+	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
+	"Category": "AEC",
+	"CreatedBy": "Speckle",
+	"CreatedByURL": "https://speckle.systems/",
+	"DocsURL": "https://github.com/specklesystems/speckle-unreal",
+	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81",
+	"SupportURL": "https://speckle.community/",
+	"CanContainContent": true,
+	"IsBetaVersion": true,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"EngineVersion": "5.2",
+	"Modules": [
+		{
+			"Name": "SpeckleUnreal",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		},
+		{
+			"Name": "SpeckleUnrealEditor",
+			"Type": "Editor",
+			"LoadingPhase": "PostEngineInit",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "LidarPointCloud",
+			"Enabled": true
+		}
+	]
+}
@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore
@@ -0,0 +1,42 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "2.19.0",
+	"FriendlyName": "Speckle Unreal",
+	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
+	"Category": "AEC",
+	"CreatedBy": "Speckle",
+	"CreatedByURL": "https://speckle.systems/",
+	"DocsURL": "https://github.com/specklesystems/speckle-unreal",
+	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81",
+	"SupportURL": "https://speckle.community/",
+	"CanContainContent": true,
+	"IsBetaVersion": true,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"EngineVersion": "5.3",
+	"Modules": [
+		{
+			"Name": "SpeckleUnreal",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		},
+		{
+			"Name": "SpeckleUnrealEditor",
+			"Type": "Editor",
+			"LoadingPhase": "PostEngineInit",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "LidarPointCloud",
+			"Enabled": true
+		}
+	]
+}
@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore
@@ -0,0 +1,42 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "2.19.0",
+	"FriendlyName": "Speckle Unreal",
+	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
+	"Category": "AEC",
+	"CreatedBy": "Speckle",
+	"CreatedByURL": "https://speckle.systems/",
+	"DocsURL": "https://github.com/specklesystems/speckle-unreal",
+	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81",
+	"SupportURL": "https://speckle.community/",
+	"CanContainContent": true,
+	"IsBetaVersion": true,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"EngineVersion": "5.4",
+	"Modules": [
+		{
+			"Name": "SpeckleUnreal",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		},
+		{
+			"Name": "SpeckleUnrealEditor",
+			"Type": "Editor",
+			"LoadingPhase": "PostEngineInit",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "LidarPointCloud",
+			"Enabled": true
+		}
+	]
+}
@@ -0,0 +1,2 @@
+[CoreRedirects]
+FunctionRedirects=(OldName="/Script/SpeckleUnreal.ObjectModelRegistry.FindClosestType",NewName="/Script/SpeckleUnreal.ObjectModelRegistry.GetAtomicType")
@@ -1,8 +1,2 @@
 [FilterPlugin]
-; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
-; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
-;
-; Examples:
-;    /README.txt
-;    /Extras/...
-;    /Binaries/ThirdParty/*.dll
+/README.md
@@ -1,34 +1,64 @@
-# Speckle Unreal
+# Speckle for Unreal Engine

-[![Twitter Follow](https://img.shields.io/twitter/follow/SpeckleSystems?style=social)](https://twitter.com/SpeckleSystems) [![Community forum users](https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&style=flat-square&logo=discourse&logoColor=white)](https://speckle.community) [![website](https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square)](https://speckle.systems) [![docs](https://img.shields.io/badge/docs-speckle.guide-orange?style=flat-square&logo=read-the-docs&logoColor=white)](https://speckle.guide/dev/)
+[![Twitter Follow](https://img.shields.io/twitter/follow/SpeckleSystems?style=social)](https://twitter.com/SpeckleSystems) [![Community forum users](https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&style=flat-square&logo=discourse&logoColor=white)](https://speckle.community) [![website](https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square)](https://speckle.systems) [![docs](https://img.shields.io/badge/docs-speckle.guide-orange?style=flat-square&logo=read-the-docs&logoColor=white)](https://speckle.guide/user/unreal.html)

-Plugin for Unreal Engine to import objects from Speckle v2.
+Speckle makes integrating Unreal Engine with your 3D workflows even easier. </br>
+This plugin connects Unreal Engine to Speckle, allowing you to receive your versioned 3D data from Speckle inside Unreal Engine,
+enabling interoperable collaboration between Unreal and other Speckle connectors (Revit, Rhino, Blender, Sketchup, Unity, AutoCAD, [and more!](https://speckle.systems/features/connectors/))


-Screencast of an example: https://user-images.githubusercontent.com/2551138/114720093-61403e00-9d40-11eb-8045-6e8ca656554d.mp4
+https://user-images.githubusercontent.com/45512892/187969471-3f548b17-3388-48ee-a07c-bd3a0ecf5149.mp4


+Checkout our dedicated [Tutorials and Docs](https://speckle.systems/tag/unreal/).
+
+If you are enjoying using Speckle, don't forget to ⭐ our [GitHub repositories](https://github.com/specklesystems),
+and [join our community forum](https://speckle.community/) where you can post any questions, suggestions, and discuss exciting projects!
+
+## Notice
+
+We officially support Unreal Engine 4.27, 5.0-5.4
+
+**Features**:
+- [Receiving Speckle geometry as Actors in editor and standalone runtime](https://speckle.systems/tutorials/getting-started-with-speckle-for-unreal/).
+- [Material override/substitiution](https://speckle.guide/user/unreal.html#material-converter).
+- [Blueprint nodes for receiving and converting objects](https://speckle.guide/user/unreal.html#usage-blueprint).
+- [Blueprint nodes for fetching stream/branch/commit/user details](https://speckle.systems/tutorials/unreal-engine-blueprint-nodes-fetch-stream-branch-commit-info-and-more/).
+- [Ability to write/extend custom conversion functions in C++/BP](https://speckle.systems/tutorials/unreal-developing-custom-conversion-logic/).
+
+**Supported Conversions**:
+
+ Speckle Type |  | Native Type |
+| ---: | :---: | :--- |
+| [`Objects.Geometry.Mesh`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/Geometry/Mesh.cs) | → | [Static Mesh Component](https://docs.unrealengine.com/4.27/en-US/API/Runtime/Engine/Components/UStaticMeshComponent/) /<br/> [Procedural Mesh Component](https://docs.unrealengine.com/4.27/en-US/API/Plugins/ProceduralMeshComponent/UProceduralMeshComponent/) |
+| [`Objects.Geometry.PointCloud`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/Geometry/Pointcloud.cs) | → | [LiDAR Point Cloud](https://docs.unrealengine.com/4.27/en-US/WorkingWithContent/LidarPointCloudPlugin/LidarPointCloudPluginReference/) |
+| [`Objects.Other.Instance`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/Other/Instance.cs) | → | Actor with Transform |
+| [`Objects.BuiltElements.View`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/BuiltElements/View.cs) | → | [Camera](https://docs.unrealengine.com/4.27/en-US/InteractiveExperiences/Framework/Camera/) |
+| [`Speckle.Core.Models.Collection`](https://github.com/specklesystems/speckle-sharp/blob/main/Core/Core/Models/Collection.cs) | → | Empty Actor |
+
+**Supported platforms**: Windows, Linux, MacOS
+*Other platforms may work, but currently untested*.


-## NOTICE
+**Limitations**:
+- Currently no support for sending Unreal geometry to Speckle.
+- Does not use the .NET or Python SDK, or the Speckle Kit based workflow, all code is in native C++/BP.
+- Does not use our shared [Desktop UI 2](https://speckle.guide/user/ui2.html), only a simple editor UI is currently provided.
+- Does not fetch [accounts from Speckle Manager](https://speckle.guide/user/manager.html#logging-in-adding-accounts), you must generate a [personal access token (auth token)](https://speckle.guide/dev/tokens.html#personal-access-tokens) to receive non-public streams.

-* Our Unreal Connector is in an beta stage of development. Currently we only support receiving objects, and there is no UI to fetch lists of streams/commits/branches.
-* We officially support Unreal Engine 4.26 and 4.27, and have experimental support for UE5.
-* Does not use the Speckle Kit workflow as conversions all happen in C++. 
+## How to install

-## How To Install
+**Speckle for Unreal Engine** can be installed through the [Unreal Engine Marketplace](https://www.unrealengine.com/marketplace/en-US/product/speckle-for-unreal-engine).

+---

-1. Download `speckle-unreal` repository archive from https://github.com/specklesystems/speckle-unreal/archive/refs/heads/main.zip 
-1. Extract the downloaded archive into your project's `Plugins` directory (if your project directory doesn't contain a directory called Plugins, you should create it)
-1. Open your UE project (or restart the editor if you already have it opened). This will build the plugin in your environment.
-
-We will eventually look to distributing the plugin officially on the Unreal Engine Marketplace but for now you'll need to install the plugin manually like this.
+Alternatively, developers may prefer to install manually.
+1. Git clone [this repo](https://github.com/specklesystems/speckle-unreal) (or download and extract the [archive zip](https://github.com/specklesystems/speckle-unreal/archive/refs/heads/main.zip)) into your project's `Plugins` directory (created as needed)
+2. Open/Restart your Unreal project. This will build the plugin for your environment.

 See our [docs](https://speckle.guide/user/unreal.html) for usage instructions.

-## Credits
-Based off the original Unreal integration for Speckle v1 by Mark and Jak which can be found here: [https://github.com/mobiusnode/SpeckleUnreal](https://github.com/mobiusnode/SpeckleUnreal).
-
-https://user-images.githubusercontent.com/2551138/114720051-571e3f80-9d40-11eb-9099-d3394747a1d3.mp4
+If you encounter build issues, try building your project from VS/Rider directly. Look at the `Saved\Logs\` files for error messages,
+and don't hesitate to reach out on our [community forums](https://speckle.community) for help!

+For contributing to any of our code repositories, please make sure you read the [contribution guidelines](https://github.com/specklesystems/speckle-sharp/blob/main/.github/CONTRIBUTING.md) for an overview of the best practices we try to follow.
@@ -1,220 +1,17 @@
-#include "API/ClientAPI.h"
+
+#include "API/ClientAPI.h"

 #include "HttpModule.h"
+#include "JsonObjectConverter.h"
 #include "Interfaces/IHttpResponse.h"
 #include "LogSpeckle.h"
 #include "Mixpanel.h"
-#include "Objects/HighLevel/SpeckleBranch.h"
-#include "Objects/HighLevel/SpeckleCommit.h"
-#include "Objects/HighLevel/SpeckleGlobals.h"
-#include "Objects/HighLevel/SpeckleUser.h"
-#include "Transports/Transport.h"

-
-void FClientAPI::StreamsGet(const FString& ServerUrl, const FString& AuthToken,
-	const int Limit,
-	const FFetchStreamDelegate OnCompleteAction, const FErrorDelegate OnErrorAction)
+void FClientAPI::MakeGraphQLRequest(const FString& ServerUrl, const FString& AuthToken,
+	const FString& ResponsePropertyName,
+	const FString& PostPayload, const FString& RequestLogName,
+	const FAPIResponceDelegate OnCompleteAction, const FErrorDelegate OnErrorAction)
 {
-	const FString RequestLogName = FString(__FUNCTION__);
-	
-	const FString PostPayload =
-		"{\"query\": \"query{user {streams(limit:" + FString::FromInt(Limit) + ") {totalCount items {id name description updatedAt createdAt isPublic role  collaborators{id name role company avatar}}}}}\"}";
-	
-	auto OnError = [=](const FString& Message) mutable 
-	{
-		ensureAlwaysMsgf(OnErrorAction.ExecuteIfBound(Message), TEXT("%s: Unhandled error - %s"), *RequestLogName , *Message);
-	};
-	
-	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
-	{
-		if(CheckRequestFailed(bWasSuccessful, Response, RequestLogName, OnError)) return;
-		
-		TSharedPtr<FJsonObject> Obj;
-		if(!GetResponseAsJSON(Response, RequestLogName, Obj, OnError)) return;
-	
-		TArray<TSharedPtr<FJsonValue>> StreamsArrJSON = Obj->GetObjectField(TEXT("data"))
-																   ->GetObjectField(TEXT("user"))
-																	  ->GetObjectField(TEXT("streams"))
-																		   ->GetArrayField(TEXT("items"));
-	
-		TArray<FSpeckleStream> Streams;
-		Streams.Reserve(StreamsArrJSON.Num());
-	
-		for (const TSharedPtr<FJsonValue> v : StreamsArrJSON)
-		{
-			FSpeckleStream Stream = FSpeckleStream(v);
-			Streams.Add(Stream);
-		}
-		
-		UE_LOG(LogSpeckle, Log, TEXT("Operation %s completed successfully. Fetched %d items"), *RequestLogName, Streams.Num());
-		ensureAlwaysMsgf(OnCompleteAction.ExecuteIfBound(Streams), TEXT("%s: Complete handler was not bound properly"), *RequestLogName);
-	};
-	
-	
-	const FHttpRequestRef Request = CreateGraphQLRequest(ServerUrl, AuthToken, PostPayload);
-	Request->OnProcessRequestComplete().BindLambda(ResponseHandler);
-	
-	SendGraphQLRequest(Request, RequestLogName, OnError);
-}
-
-void FClientAPI::StreamGetBranches(
-	const FString& ServerUrl, const FString& AuthToken,
-	const FString& StreamId, const int32 Limit,
-	const FFetchBranchDelegate OnCompleteAction, const FErrorDelegate OnErrorAction)
-{
-	const FString RequestLogName = FString(__FUNCTION__);
-	
-	//TODO limit
-	FString PostPayload = "{\"query\": \"query{ stream (id: \\\"" +
-			StreamId + "\\\"){id name branches(limit : " + FString::FromInt(Limit) + ") {totalCount cursor items{ id name description}}}}\"}";
-
-	// The above can be extended with author information 
-	//query{stream(id:"a18f8c8569"){id name branches{totalCount items{id name description author{id, name, email, commits{cursor}}}}}}
-	
-	auto OnError = [=](const FString& Message) mutable 
-	{
-		ensureAlwaysMsgf(OnErrorAction.ExecuteIfBound(Message), TEXT("%s: Unhandled error - %s"), *RequestLogName , *Message);
-	};
-	
-	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
-	{
-		if(CheckRequestFailed(bWasSuccessful, Response, RequestLogName, OnError)) return;
-		
-		TSharedPtr<FJsonObject> Obj;
-		if(!GetResponseAsJSON(Response, RequestLogName, Obj, OnError)) return;
-		
-		TArray<TSharedPtr<FJsonValue>> BranchesArrJSON = Obj->GetObjectField(TEXT("data"))
-																	->GetObjectField(TEXT("stream"))
-																		->GetObjectField(TEXT("branches"))
-																				->GetArrayField(TEXT("items"));
-		TArray<FSpeckleBranch> Branches;
-		Branches.Reserve(BranchesArrJSON.Num());
-	
-		for (const TSharedPtr<FJsonValue>& v : BranchesArrJSON)
-		{
-			const TSharedPtr<FJsonObject>* BranchObj;
-			if(ensureAlways(v->TryGetObject(BranchObj)))
-			{
-				FSpeckleBranch Branch = FSpeckleBranch(*BranchObj);
-				Branches.Add(Branch);
-			}
-		}
-		
-		UE_LOG(LogSpeckle, Log, TEXT("Operation %s completed successfully. Fetched %d items"), *RequestLogName, Branches.Num());
-		ensureAlwaysMsgf(OnCompleteAction.ExecuteIfBound(Branches), TEXT("%s: Complete handler was not bound properly"), *RequestLogName);
-	};
-	
-	
-	const FHttpRequestRef Request = CreateGraphQLRequest(ServerUrl, AuthToken, PostPayload);
-	Request->OnProcessRequestComplete().BindLambda(ResponseHandler);
-	
-	SendGraphQLRequest(Request, RequestLogName, OnError);
-}
-
-
-void FClientAPI::StreamGetCommits(const FString& ServerUrl, const FString& AuthToken,
-	const FString& StreamId, const FString& BranchName, const int32 Limit,
-	const FFetchCommitDelegate OnCompleteAction, const FErrorDelegate OnErrorAction)
-{
-	const FString RequestLogName = FString(__FUNCTION__);
-	
-	FString PostPayload = "{\"query\": \"query{stream (id: \\\"" + StreamId +
-		"\\\"){id name createdAt updatedAt "
-					+ "branch(name: \\\"" + BranchName + "\\\" ){id name description author{name id email} " +
-					"commits(limit: " + FString::FromInt(Limit) + "){totalCount items {id referencedObject sourceApplication totalChildrenCount " +
-					"branchName parents authorName authorId message createdAt commentCount}}}}}\"}"; // authorAvatar 
-	
-	auto OnError = [=](const FString& Message) mutable 
-	{
-		ensureAlwaysMsgf(OnErrorAction.ExecuteIfBound(Message), TEXT("%s: Unhandled error - %s"), *RequestLogName , *Message);
-	};
-	
-	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
-	{
-		if(CheckRequestFailed(bWasSuccessful, Response, RequestLogName, OnError)) return;
-		
-		TSharedPtr<FJsonObject> Obj;
-		if(!GetResponseAsJSON(Response, RequestLogName, Obj, OnError)) return;
-		
-		TArray<TSharedPtr<FJsonValue>> CommitsArrJSON = Obj->GetObjectField(TEXT("data"))
-															 ->GetObjectField(TEXT("stream"))
-															   ->GetObjectField(TEXT("branch"))
-																 ->GetObjectField(TEXT("commits"))
-																   ->GetArrayField(TEXT("items"));
-	
-		TArray<FSpeckleCommit> ArrayOfCommits;
-		ArrayOfCommits.Reserve(CommitsArrJSON.Num());
-	
-		for (const TSharedPtr<FJsonValue> v : CommitsArrJSON)
-		{
-			FSpeckleCommit Commit = FSpeckleCommit(v);
-			ArrayOfCommits.Add( Commit );
-		}
-
-		UE_LOG(LogSpeckle, Log, TEXT("Operation %s completed successfully. Fetched %d items"), *RequestLogName, ArrayOfCommits.Num());
-		ensureAlwaysMsgf(OnCompleteAction.ExecuteIfBound(ArrayOfCommits), TEXT("%s: Complete handler was not bound properly"), *RequestLogName);
-	};
-	
-	
-	const FHttpRequestRef Request = CreateGraphQLRequest(ServerUrl, AuthToken, PostPayload);
-	Request->OnProcessRequestComplete().BindLambda(ResponseHandler);
-	
-	SendGraphQLRequest(Request, RequestLogName, OnError);
-}
-
-
-void FClientAPI::FetchGlobals(const FString& ServerUrl, const FString& AuthToken,
-	const FString& StreamId, const FString& ReferencedObjectId,
-    const FFetchGlobalsDelegate OnCompleteAction, const FErrorDelegate OnErrorAction)
-{
-	const FString RequestLogName = FString(__FUNCTION__);
-	
-	FString PostPayload = "{\"query\": \"query{stream (id:\\\"" + StreamId +
-							 "\\\"){id name description updatedAt createdAt role isPublic object(id:\\\"" +
-								ReferencedObjectId +
-							    	"\\\"){id data}}}\"}";
-	
-	auto OnError = [=](const FString& Message) mutable 
-	{
-		ensureAlwaysMsgf(OnErrorAction.ExecuteIfBound(Message), TEXT("%s: Unhandled error - %s"), *RequestLogName , *Message);
-	};
-	
-	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
-	{
-		if(CheckRequestFailed(bWasSuccessful, Response, RequestLogName, OnError)) return;
-		
-		TSharedPtr<FJsonObject> Obj;
-		if(!GetResponseAsJSON(Response, RequestLogName, Obj, OnError)) return;
-		
-		TSharedPtr<FJsonObject> GlobalsJSONObject = Obj->GetObjectField(TEXT("data"))
-															->GetObjectField(TEXT("stream"))
-																->GetObjectField(TEXT("object"))
-																	->GetObjectField(TEXT("data"));
-
-
-		
-		
-		FSpeckleGlobals Globals = FSpeckleGlobals(GlobalsJSONObject);
-		
-		UE_LOG(LogSpeckle, Log, TEXT("Operation %s completed successfully"), *RequestLogName);
-		ensureAlwaysMsgf(OnCompleteAction.ExecuteIfBound(Globals), TEXT("%s: Complete handler was not bound properly"), *RequestLogName);
-	};
-	
-	
-	const FHttpRequestRef Request = CreateGraphQLRequest(ServerUrl, AuthToken, PostPayload);
-	Request->OnProcessRequestComplete().BindLambda(ResponseHandler);
-	
-	SendGraphQLRequest(Request, RequestLogName, OnError);
-}
-
-void FClientAPI::FetchUserData(const FString& ServerUrl, const FString& AuthToken,
-    const FFetchUserDelegate OnCompleteAction, const FErrorDelegate OnErrorAction)
-{
-	const FString RequestLogName = FString(__FUNCTION__);
-	
-	const FString PostPayload =
-		"{\"query\": \"query{user{id name email company role suuid bio profiles avatar}}\"}"; 
-	
 	
 	auto OnError = [=](const FString& Message) mutable 
 	{
@@ -228,24 +25,74 @@ void FClientAPI::FetchUserData(const FString& ServerUrl, const FString& AuthToke
 		
 		TSharedPtr<FJsonObject> Obj;
 		if(!GetResponseAsJSON(Response, RequestLogName, Obj, OnError)) return;
+
+		const TSharedPtr<FJsonObject>* DataObjectPtr;
+		if(!Obj->TryGetObjectField(TEXT("data"), DataObjectPtr))
+		{
+			OnError(TEXT("%s responce was invalid, expected to find a \"data\" property in response"));
+			return;
+		}
+		const TSharedPtr<FJsonObject> DataObject = *DataObjectPtr;
 		
-		TSharedPtr<FJsonObject> UserJSONObject = Obj->GetObjectField(TEXT("data"))
-													    ->GetObjectField(TEXT("user"));
+		const TSharedPtr<FJsonObject>* RequestedJson;
+		if(!DataObject->TryGetObjectField(ResponsePropertyName, RequestedJson))
+		{
+			//Requested property has a null or non-object value
+			if(DataObject->HasField(ResponsePropertyName))
+			{
+				FString Message = FString::Printf(TEXT("%s: Response data contained the requested property \"%s\", but the value was null was or not an object."),
+				*RequestLogName, *ResponsePropertyName);
+				OnError(Message);
+				return;
+			}
+
+			//Requested property was missing
+			TArray<FString> Options;
+			Options.Reserve(DataObject->Values.Num());
+			for(const auto& Properties : DataObject->Values)
+			{
+				Options.Add(FString::Printf(TEXT("\"%s\" "), *Properties.Key));
+			}
+			
+			FString Message = FString::Printf(TEXT("%s: Could not find the requested property name \"%s\" in responce data.\n Got { %s} instead."),
+				*RequestLogName, *ResponsePropertyName, *FString::Join(Options, TEXT(", ")));
+			OnError(Message);
+			return;
+		}
 		
-		FSpeckleUser MyUserData = FSpeckleUser( UserJSONObject );
+		FString OutputString;
+		const TSharedRef<TJsonWriter<>> Writer = TJsonWriterFactory<>::Create(&OutputString);
+		ensureAlways(FJsonSerializer::Serialize(RequestedJson->ToSharedRef(), Writer));
+
+		// Commented out, deserialisation done by caller
+		//void* DeserializedData;
+		//FSpeckleUser DeserializedData = FSpeckleUser( UserJSONObject );
+		// if(!FJsonObjectConverter::JsonObjectToUStruct(*RequestedJson, OutStructType::StaticStruct(), &DeserializedData, 0, 0))
+		// {
+		// 	OnError("Failed to deserialize user object");
+		// 	return;
+		// }
 		
 		UE_LOG(LogSpeckle, Log, TEXT("Operation %s completed successfully"), *RequestLogName);
-		ensureAlwaysMsgf(OnCompleteAction.ExecuteIfBound(MyUserData), TEXT("%s: Complete handler was not bound properly"), *RequestLogName);
+		ensureAlwaysMsgf(OnCompleteAction.ExecuteIfBound(OutputString), TEXT("%s: Complete handler was not bound properly"), *RequestLogName);
 	};

-	const FHttpRequestRef Request = CreateGraphQLRequest(ServerUrl, AuthToken, PostPayload);
+	const FHttpRequestRef Request = CreatePostRequest(ServerUrl, AuthToken, PostPayload);
 	Request->OnProcessRequestComplete().BindLambda(ResponseHandler);
 	
-	SendGraphQLRequest(Request, RequestLogName, OnError);
+	if(Request->ProcessRequest())
+	{
+		UE_LOG(LogSpeckle, Log, TEXT("POST Request %s to %s was sent, awaiting response"), *RequestLogName, *Request->GetURL() );
+	}
+	else
+	{
+		UE_LOG(LogSpeckle, Warning, TEXT("POST Request %s to %s failed to send"), *RequestLogName, *Request->GetURL() );
+	}
+	
+	FAnalytics::TrackEvent(Request->GetURL(), TEXT("NodeRun"), TMap<FString, FString> { {TEXT("name"), __FUNCTION__}});
 }


-
 bool FClientAPI::GetResponseAsJSON(const FHttpResponsePtr Response, const FString& RequestLogName, TSharedPtr<FJsonObject>& OutObject, const TFunctionRef<void(const FString& Message)> OnErrorAction)
 {

@@ -273,40 +120,23 @@ bool FClientAPI::GetResponseAsJSON(const FHttpResponsePtr Response, const FStrin
 	return true;
 }

-FHttpRequestRef FClientAPI::CreateGraphQLRequest(const FString& ServerUrl, const FString AuthToken, const FString& PostPayload, const FString& Encoding)
+FHttpRequestRef FClientAPI::CreatePostRequest(const FString& ServerUrl, const FString AuthToken, const FString& PostPayload, const FString& Encoding)
 {
 	FHttpRequestRef Request = FHttpModule::Get().CreateRequest();

-	Request->SetURL(ServerUrl + "/graphql");
+	Request->SetURL(ServerUrl + TEXT("/graphql"));
 	Request->SetVerb(TEXT("POST"));
-	Request->SetHeader("Accept-Encoding", Encoding);
-	Request->SetHeader("Content-Type", TEXT("application/json"));
-	Request->SetHeader("Authorization", "Bearer " + AuthToken);
+	Request->SetHeader(TEXT("Accept-Encoding"), Encoding);
+	Request->SetHeader(TEXT("Content-Type"), TEXT("application/json"));
+	if(!AuthToken.IsEmpty())
+		Request->SetHeader(TEXT("Authorization"), FString::Printf(TEXT("Bearer %s"), *AuthToken));
+	Request->SetHeader(TEXT("apollographql-client-name"), TEXT("Unreal Engine"));
+	Request->SetHeader(TEXT("apollographql-client-version"), SPECKLE_CONNECTOR_VERSION);
 	Request->SetContentAsString(PostPayload);

 	return Request;
 }

-bool FClientAPI::SendGraphQLRequest(const FHttpRequestRef Request, const FString& RequestName,
- const TFunctionRef<void(const FString& Message)> OnErrorAction)
-{
-	const bool RequestSent = Request->ProcessRequest();
-
-	if(!RequestSent)
-	{
-		const FString Message = FString::Printf(TEXT("Request \"%s\" at \"%s\" failed: \nHTTP request failed to start"),
-					*RequestName, *Request->GetURL());
-		
-		OnErrorAction(Message);
-	}
-	else
-	{
-		UE_LOG(LogSpeckle, Log, TEXT("POST Request %s to %s was sent, awaiting response"), *RequestName, *Request->GetURL() );
-		FAnalytics::TrackEvent("unknown", Request->GetURL(), "NodeRun", TMap<FString, FString> { {"name", RequestName }});
-	}
-	
-	return RequestSent;
-}


 bool FClientAPI::CheckRequestFailed(bool bWasSuccessful, FHttpResponsePtr Response,  const FString& RequestLogName, const TFunctionRef<void(const FString& Message)> OnErrorAction)
@@ -324,8 +154,8 @@ bool FClientAPI::CheckRequestFailed(bool bWasSuccessful, FHttpResponsePtr Respon
 	const int32 ResponseCode = Response->GetResponseCode();
 	if (ResponseCode != 200)
 	{
-		FString Message = FString::Printf(TEXT("Request \"%s\" to \"%s\" failed with HTTP response %d"),
-												*RequestLogName, *Response->GetURL(), ResponseCode);
+		FString Message = FString::Printf(TEXT("Request \"%s\" to \"%s\" failed with HTTP response %d - %s"),
+												*RequestLogName, *Response->GetURL(), ResponseCode, *Response->GetContentAsString());
 		OnErrorAction(Message);
 		return true;
 	}
@@ -341,17 +171,17 @@ bool FClientAPI::CheckForOperationErrors(const TSharedPtr<FJsonObject> GraphQLRe
 	
 	bool WasError = false;
 	const TArray<TSharedPtr<FJsonValue>>* Errors;
-	if(GraphQLResponse->TryGetArrayField(TEXT("Errors"), Errors))
+	if(GraphQLResponse->TryGetArrayField(TEXT("errors"), Errors))
 	{
 		for(const TSharedPtr<FJsonValue>& e : *Errors)
 		{
 			FString Message;
 			const TSharedPtr<FJsonObject>* ErrorObject;
 			bool HadMessage = e->TryGetObject(ErrorObject)
-				&& (*ErrorObject)->TryGetStringField("message", Message);
+				&& (*ErrorObject)->TryGetStringField(TEXT("message"), Message);
 			if(!HadMessage)
 			{
-				Message = "An operation error occured but had no message!\n";
+				Message = TEXT("An operation error occured but had no message!\n");
 				UE_LOG(LogSpeckle, Warning, TEXT("%s"), *Message);
 			}
 			
@@ -1,73 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "API/Operations/ReceiveBranchesOperation.h"
-
-#include "Mixpanel.h"
-#include "LogSpeckle.h"
-#include "API/ClientAPI.h"
-
-
-UReceiveBranchesOperation* UReceiveBranchesOperation::ReceiveBranchesOperation(UObject* WorldContextObject,
-                                                                               const FString& ServerUrl, const FString& AuthToken,
-                                                                               const FString& StreamId, int32 Limit)
-{
-	FString ObjectId = "Streams";
-	
-    UReceiveBranchesOperation* Node = NewObject<UReceiveBranchesOperation>();
-    Node->StreamId = StreamId.TrimEnd();
-    Node->ServerUrl = ServerUrl.TrimEnd();
-	while(Node->ServerUrl.RemoveFromEnd("/")) { }
-	Node->AuthToken = AuthToken.TrimEnd();
-	Node->Limit = Limit;
-
-	Node->RegisterWithGameInstance(WorldContextObject);
-    return Node;
-}
-
-void UReceiveBranchesOperation::Activate()
-{
-	FAnalytics::TrackEvent("unknown",
-		ServerUrl, "NodeRun", TMap<FString, FString> { {"name", StaticClass()->GetName() }});
-	
-	Request();
-}
-
-void UReceiveBranchesOperation::Request()
-{
-	ensureAlways(Limit > 0);
-
-	FFetchBranchDelegate CompleteDelegate;
-	CompleteDelegate.BindUObject(this, &UReceiveBranchesOperation::HandleReceive);
-	
-	FErrorDelegate ErrorDelegate;
-	ErrorDelegate.BindUObject(this, &UReceiveBranchesOperation::HandleError);
-
-	FClientAPI::StreamGetBranches(ServerUrl, AuthToken, StreamId, Limit, CompleteDelegate, ErrorDelegate);
-}
-
-void UReceiveBranchesOperation::HandleReceive(const TArray<FSpeckleBranch>& Branches)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Log, TEXT("%s to %s Succeeded"), *StaticClass()->GetName(), *ServerUrl);
-	
-	
-	FEditorScriptExecutionGuard ScriptGuard;
-	OnReceiveSuccessfully.Broadcast(Branches, "");		
-	
-	SetReadyToDestroy();
-}
-
-void UReceiveBranchesOperation::HandleError(const FString& Message)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Warning, TEXT("%s failed - %s"), *StaticClass()->GetName(), *Message);
-
-	FEditorScriptExecutionGuard ScriptGuard;
-
-	const TArray<FSpeckleBranch> EmptyList;
-	OnError.Broadcast(EmptyList, Message);
-	
-	SetReadyToDestroy();
-}
-
@@ -1,72 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "API/Operations/ReceiveCommitsOperation.h"
-
-#include "Mixpanel.h"
-#include "LogSpeckle.h"
-#include "API/ClientAPI.h"
-
-
-// ReceiveOperation
-UReceiveCommitsOperation* UReceiveCommitsOperation::ReceiveCommitsOperation(UObject* WorldContextObject,
-	const FString& ServerUrl, const FString& AuthToken,
-	const FString& StreamId, const FString& BranchName, const int32 Limit)
-{
-    UReceiveCommitsOperation* Node = NewObject<UReceiveCommitsOperation>();
-    Node->ServerUrl = ServerUrl.TrimEnd();
-	while(Node->ServerUrl.RemoveFromEnd("/")) { }
-	Node->AuthToken = AuthToken.TrimEnd();
-    Node->StreamId = StreamId.TrimEnd();
-	Node->BranchName = BranchName;
-    Node->Limit = Limit;
-	Node->RegisterWithGameInstance(WorldContextObject);
-    return Node;
-}
-
-// Activate
-void UReceiveCommitsOperation::Activate()
-{
-	FAnalytics::TrackEvent("unknown", ServerUrl,
-		 "NodeRun", TMap<FString, FString> { {"name", StaticClass()->GetName() }});
-	
-	Request();
-}
-
-void UReceiveCommitsOperation::Request()
-{
-	ensureAlways(Limit > 0);
-
-	FFetchCommitDelegate CompleteDelegate;
-	CompleteDelegate.BindUObject(this, &UReceiveCommitsOperation::HandleReceive);
-
-	FErrorDelegate ErrorDelegate;
-	ErrorDelegate.BindUObject(this, &UReceiveCommitsOperation::HandleError);
-
-	FClientAPI::StreamGetCommits(ServerUrl, AuthToken, StreamId, BranchName, Limit, CompleteDelegate, ErrorDelegate);
-}
-
-void UReceiveCommitsOperation::HandleReceive(const TArray<FSpeckleCommit>& Commits)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Log, TEXT("%s to %s Succeeded"), *StaticClass()->GetName(), *ServerUrl);
-	FEditorScriptExecutionGuard ScriptGuard;
-	
-	OnReceiveSuccessfully.Broadcast(Commits, "");
-	
-	SetReadyToDestroy();
-}
-
-void UReceiveCommitsOperation::HandleError(const FString& Message)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Warning, TEXT("%s failed - %s"), *StaticClass()->GetName(), *Message);
-	
-	FEditorScriptExecutionGuard ScriptGuard;
-	
-	const TArray<FSpeckleCommit> EmptyList;
-	OnError.Broadcast(EmptyList, Message);
-	
-	SetReadyToDestroy();
-}
-
@@ -1,66 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "API/Operations/ReceiveGlobalsOperation.h"
-
-#include "Mixpanel.h"
-#include "LogSpeckle.h"
-#include "API/ClientAPI.h"
-
-
-UReceiveGlobalsOperation* UReceiveGlobalsOperation::ReceiveGlobalsOperation(UObject* WorldContextObject,
-                                                                            const FString& ServerUrl, const FString& AuthToken,
-                                                                            const FString& StreamId, const FString& ReferencedObjectId)
-{
-    UReceiveGlobalsOperation* Node = NewObject<UReceiveGlobalsOperation>();
-    Node->ServerUrl = ServerUrl.TrimEnd();
-	while(Node->ServerUrl.RemoveFromEnd("/")) { }
-	Node->AuthToken = AuthToken.TrimEnd();;
-    Node->StreamId = StreamId.TrimEnd();;
-    Node->ReferencedObjectId = ReferencedObjectId;
-
-	Node->RegisterWithGameInstance(WorldContextObject);
-    return Node;
-}
-
-void UReceiveGlobalsOperation::Activate()
-{
-	FAnalytics::TrackEvent("unknown",
-		ServerUrl, "NodeRun", TMap<FString, FString> { {"name", StaticClass()->GetName() }});
-	
-	Request();
-}
-
-void UReceiveGlobalsOperation::Request()
-{
-	FFetchGlobalsDelegate CompleteDelegate;
-	CompleteDelegate.BindUObject(this, &UReceiveGlobalsOperation::HandleReceive);
-
-	FErrorDelegate ErrorDelegate;
-	ErrorDelegate.BindUObject(this, &UReceiveGlobalsOperation::HandleError);
-	
-	FClientAPI::FetchGlobals(ServerUrl, AuthToken, StreamId, ReferencedObjectId, CompleteDelegate, ErrorDelegate);
-}
-
-
-
-void UReceiveGlobalsOperation::HandleReceive(const FSpeckleGlobals& Object)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Log, TEXT("%s to %s Succeeded"), *StaticClass()->GetName(), *ServerUrl);
-	FEditorScriptExecutionGuard ScriptGuard;
-	OnReceiveSuccessfully.Broadcast(Object, "");		
-	
-	SetReadyToDestroy();
-}
-
-void UReceiveGlobalsOperation::HandleError(const FString& Message)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Warning, TEXT("%s failed - %s"), *StaticClass()->GetName(), *Message);
-	
-	FEditorScriptExecutionGuard ScriptGuard;
-	const FSpeckleGlobals BlankGlobals;
-	OnError.Broadcast(BlankGlobals, Message);
-	SetReadyToDestroy();
-}
@@ -1,64 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "API/Operations/ReceiveMyUserDataOperation.h"
-
-#include "Mixpanel.h"
-#include "LogSpeckle.h"
-#include "API/ClientAPI.h"
-
-
-UReceiveMyUserDataOperation* UReceiveMyUserDataOperation::ReceiveMyUserDataOperation(
-	UObject* WorldContextObject, const FString& ServerUrl, const FString& AuthToken)
-{
-    UReceiveMyUserDataOperation* Node = NewObject<UReceiveMyUserDataOperation>();
-    Node->ServerUrl = ServerUrl.TrimEnd();;
-	while(Node->ServerUrl.RemoveFromEnd("/")) { }
-    Node->AuthToken = AuthToken.TrimEnd();;
-
-	Node->RegisterWithGameInstance(WorldContextObject);
-    return Node;
-}
-
-void UReceiveMyUserDataOperation::Activate()
-{
-	FAnalytics::TrackEvent("unknown",
-		ServerUrl, "NodeRun", TMap<FString, FString> { {"name", StaticClass()->GetName() }});
-
-	Request();
-}
-
-
-void UReceiveMyUserDataOperation::Request()
-{
-	FFetchUserDelegate CompleteDelegate;
-	CompleteDelegate.BindUObject(this, &UReceiveMyUserDataOperation::HandleReceive);
-
-	FErrorDelegate ErrorDelegate;
-	ErrorDelegate.BindUObject(this, &UReceiveMyUserDataOperation::HandleError);
-	
-	FClientAPI::FetchUserData(ServerUrl, AuthToken, CompleteDelegate, ErrorDelegate);
-}
-
-
-
-void UReceiveMyUserDataOperation::HandleReceive(const FSpeckleUser& Object)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Log, TEXT("%s to %s Succeeded"), *StaticClass()->GetName(), *ServerUrl);
-	FEditorScriptExecutionGuard ScriptGuard;
-	OnReceiveSuccessfully.Broadcast(Object, "");		
-	
-	SetReadyToDestroy();
-}
-
-void UReceiveMyUserDataOperation::HandleError(const FString& Message)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Warning, TEXT("%s failed - %s"), *StaticClass()->GetName(), *Message);
-	
-	FEditorScriptExecutionGuard ScriptGuard;
-	const FSpeckleUser BlankUser;
-	OnError.Broadcast(BlankUser, Message);
-	SetReadyToDestroy();
-}
@@ -1,5 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "API/Operations/ReceiveOperation.h"

@@ -10,7 +8,6 @@
 #include "Mixpanel.h"


-// ReceiveOperation
 UReceiveOperation* UReceiveOperation::ReceiveOperation(UObject* WorldContextObject,
 													   const FString& ObjectId,
 							                           TScriptInterface<ITransport> RemoteTransport,
@@ -25,13 +22,10 @@ UReceiveOperation* UReceiveOperation::ReceiveOperation(UObject* WorldContextObje
    return Node;
 }

-// Activate
 void UReceiveOperation::Activate()
 {
-	FAnalytics::TrackEvent("unknown",
-		"unknown", "NodeRun", TMap<FString, FString> { {"name", StaticClass()->GetName() }});
+	FAnalytics::TrackEvent("unknown", "NodeRun", TMap<FString, FString> { {"name", StaticClass()->GetName()} });

-	//Async(EAsyncExecution::Thread, [this]{Receive();});
 	Receive();
 }

@@ -1,69 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "API/Operations/ReceiveStreamsOperation.h"
-
-#include "Mixpanel.h"
-#include "LogSpeckle.h"
-#include "API/ClientAPI.h"
-
-
-UReceiveStreamsOperation* UReceiveStreamsOperation::ReceiveStreamsOperation(UObject* WorldContextObject,
-                                                                            const FString& ServerUrl,
-                                                                            const FString& AuthToken,
-                                                                            const int32 Limit)
-{
-	FString ObjectId = "Streams";
-	
-    UReceiveStreamsOperation* Node = NewObject<UReceiveStreamsOperation>();
-    Node->ServerUrl = ServerUrl.TrimEnd();;
-	Node->AuthToken = AuthToken.TrimEnd();;
-	Node->Limit = Limit;
-
-	Node->RegisterWithGameInstance(WorldContextObject);
-    return Node;
-}
-
-void UReceiveStreamsOperation::Activate()
-{
-	FAnalytics::TrackEvent("unknown",
-		ServerUrl, "NodeRun", TMap<FString, FString> { {"name", StaticClass()->GetName() }});
-
-	Request();
-}
-
-void UReceiveStreamsOperation::Request()
-{
-	FFetchStreamDelegate CompleteDelegate;
-	CompleteDelegate.BindUObject(this, &UReceiveStreamsOperation::HandleReceive);
-
-	FErrorDelegate ErrorDelegate;
-	ErrorDelegate.BindUObject(this, &UReceiveStreamsOperation::HandleError);
-
-	FClientAPI::StreamsGet(ServerUrl, AuthToken, Limit, CompleteDelegate, ErrorDelegate);
-}
-
-void UReceiveStreamsOperation::HandleReceive(const TArray<FSpeckleStream>& Streams)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Log, TEXT("%s to %s Succeeded"), *StaticClass()->GetName(), *ServerUrl);
-	
-	FEditorScriptExecutionGuard ScriptGuard;
-	OnReceiveSuccessfully.Broadcast(Streams, "");		
-	
-	SetReadyToDestroy();
-}
-
-void UReceiveStreamsOperation::HandleError(const FString& Message)
-{
-	check(IsInGameThread());
-	UE_LOG(LogSpeckle, Warning, TEXT("%s failed - %s"), *StaticClass()->GetName(), *Message);
-	
-	FEditorScriptExecutionGuard ScriptGuard;
-	
-	const TArray<FSpeckleStream> EmptyList;
-	OnError.Broadcast(EmptyList, Message);
-		
-	SetReadyToDestroy();
-}
-
@@ -1,22 +0,0 @@
-#include "API/Operations/SendOperation.h"
-
-
-
-// USendOperation* USendOperation::SendOperation(UObject* WorldContextObject, UBase* Base, TScriptArray<TScriptInterface<ITransport>> Transports)
-// {
-// 	USendOperation* Node = NewObject<USendOperation>();
-// 	Node->Base = Base;
-// 	Node->Transports = Transports;
-//
-// 	Node->RegisterWithGameInstance(WorldContextObject);
-// 	return Node;
-// }
-//
-// void USendOperation::Activate()
-// {
-// 	check(Transports.Num() > 0);
-//
-// 	//TODO implement
-// 	unimplemented();
-// 	
-// }
@@ -0,0 +1,68 @@
+
+#include "API/Operations/SpeckleStreamAPIOperation.h"
+
+#include "JsonObjectConverter.h"
+#include "Mixpanel.h"
+#include "LogSpeckle.h"
+#include "API/ClientAPI.h"
+
+
+USpeckleStreamAPIOperation* USpeckleStreamAPIOperation::SpeckleStreamAPIOperation(
+																		const FString& ServerUrl,
+																		const FString& AuthToken,
+																		const FString& GraphQlQuery,
+																		const FString& ResponsePropertyName, 
+																		const FString& RequestLogName)
+{
+    USpeckleStreamAPIOperation* Node = NewObject<USpeckleStreamAPIOperation>();
+    Node->ServerUrl = ServerUrl.TrimEnd();
+	Node->AuthToken = AuthToken.TrimEnd();
+	Node->Query = GraphQlQuery;
+	Node->ResponsePropertyName = ResponsePropertyName;
+	Node->RequestLogName = RequestLogName;
+	
+    return Node;
+}
+
+void USpeckleStreamAPIOperation::Activate()
+{
+	FAnalytics::TrackEvent(ServerUrl, "NodeRun", TMap<FString, FString> { {"name", RequestLogName} });
+
+	Request();
+}
+
+void USpeckleStreamAPIOperation::Request()
+{
+	FString Payload = FString::Printf(TEXT("{\"query\": \"%s\"}"), *Query.ReplaceCharWithEscapedChar());
+	FAPIResponceDelegate CompleteDelegate;
+	CompleteDelegate.BindUObject(this, &USpeckleStreamAPIOperation::HandleReceive);
+
+	FErrorDelegate ErrorDelegate;
+	ErrorDelegate.BindUObject(this, &USpeckleStreamAPIOperation::HandleError);
+	FClientAPI::MakeGraphQLRequest(ServerUrl, AuthToken, ResponsePropertyName, Payload,RequestLogName , CompleteDelegate, ErrorDelegate);
+}
+
+void USpeckleStreamAPIOperation::HandleReceive(const FString& ResponseJson)
+{
+	check(IsInGameThread());
+	
+	UE_LOG(LogSpeckle, Log, TEXT("%s to %s Succeeded"), *StaticClass()->GetName(), *ServerUrl);
+	
+	FEditorScriptExecutionGuard ScriptGuard;
+	OnReceiveSuccessfully.Broadcast(ResponseJson, "");		
+	
+	SetReadyToDestroy();
+}
+
+void USpeckleStreamAPIOperation::HandleError(const FString& Message)
+{
+	check(IsInGameThread());
+	
+	UE_LOG(LogSpeckle, Warning, TEXT("%s failed - %s"), *StaticClass()->GetName(), *Message);
+	
+	FEditorScriptExecutionGuard ScriptGuard;
+	OnError.Broadcast("", Message);
+		
+	SetReadyToDestroy();
+}
+
@@ -0,0 +1,57 @@
+
+#include "API/SpeckleAPIFunctions.h"
+
+#include "JsonObjectConverter.h"
+
+bool USpeckleAPIFunctions::DeserializeResponse(const FString& JsonString, int32& OutStruct)
+{
+	// We should never hit this!  stubs to avoid NoExport on the class.
+	check(0);
+	return false;
+}
+
+
+bool USpeckleAPIFunctions::GenericDeserializeResponse(const FString& JsonString, const UScriptStruct* StructType,
+	void* OutStruct)
+{
+	//see FJsonObjectConverter::JsonObjectStringToUStruct
+	TSharedPtr<FJsonObject> JsonObject;
+	TSharedRef<TJsonReader<> > JsonReader = TJsonReaderFactory<>::Create(JsonString);
+	if (!FJsonSerializer::Deserialize(JsonReader, JsonObject) || !JsonObject.IsValid())
+	{
+		UE_LOG(LogJson, Warning, TEXT("JsonObjectStringToUStruct - Unable to parse json=[%s]"), *JsonString);
+		return false;
+	}
+	if (!FJsonObjectConverter::JsonObjectToUStruct(JsonObject.ToSharedRef(), StructType, OutStruct, 0, 0))
+	{
+		UE_LOG(LogJson, Warning, TEXT("JsonObjectStringToUStruct - Unable to deserialize. json=[%s]"), *JsonString);
+		return false;
+	}
+	return true;
+}
+
+void USpeckleAPIFunctions::CommitReceived(FSpeckleCommit& Commit)
+{
+	//TODO send read read receipt
+	//FString Query = FString::Printf(TEXT("mutation{ commitReceive(input:%s) }"), );
+}
+
+DEFINE_FUNCTION(USpeckleAPIFunctions::execDeserializeResponse)
+{
+	// Get JsonString
+	P_GET_PROPERTY(FStrProperty, JsonString);
+	
+	// Get OutStruct
+	Stack.MostRecentPropertyAddress = nullptr;
+	Stack.StepCompiledIn<FStructProperty>(nullptr);
+	void* OutBlueprintDataPtr = Stack.MostRecentPropertyAddress;
+	FStructProperty* StructProp = CastField<FStructProperty>(Stack.MostRecentProperty);
+	UScriptStruct* StructType = StructProp->Struct;
+	
+	P_FINISH;
+	
+	P_NATIVE_BEGIN;
+	
+	*static_cast<bool*>(RESULT_PARAM) = GenericDeserializeResponse(JsonString, StructType, OutBlueprintDataPtr);
+	P_NATIVE_END;
+}
@@ -1,7 +1,9 @@
-#include "API/SpeckleSerializer.h"
+
+#include "API/SpeckleSerializer.h"

 #include "Objects/Base.h"
 #include "LogSpeckle.h"
+#include "Objects/DisplayValueElement.h"
 #include "Objects/Utils/SpeckleObjectUtils.h"
 #include "Objects/ObjectModelRegistry.h"
 #include "Templates/SubclassOf.h"
@@ -9,7 +11,6 @@
 #include "UObject/Package.h"


-// Create the Deserialization Base
 UBase* USpeckleSerializer::DeserializeBase(const TSharedPtr<FJsonObject> Obj,
 										   const TScriptInterface<ITransport> ReadTransport)
 {
@@ -23,18 +24,20 @@ UBase* USpeckleSerializer::DeserializeBase(const TSharedPtr<FJsonObject> Obj,
 	}
 		
 	FString SpeckleType;	
-	if (!Obj->TryGetStringField("speckle_type", SpeckleType)) return nullptr;
+	if (!Obj->TryGetStringField(TEXT("speckle_type"), SpeckleType)) return nullptr;
 	FString ObjectId = "";	
-	Obj->TryGetStringField("id", ObjectId);
+	Obj->TryGetStringField(TEXT("id"), ObjectId);
 		
 	TSubclassOf<UBase> BaseType;
-
-	FString WorkingType(SpeckleType);
 	
-	int32 Tries = 1000;
+	FString WorkingType{};
+	FString Remainder = FString(SpeckleType);
+
+	int32 Tries = 200;
 	while(ensure(Tries-- > 0))
 	{
-		//Try and deserialize
+		const bool IsLastChance = !UObjectModelRegistry::SplitSpeckleType(Remainder, Remainder, WorkingType);
+		
 		if(UObjectModelRegistry::TryGetRegisteredType(WorkingType, BaseType))
 		{
 			UBase* Base = NewObject<UBase>(GetTransientPackage(), BaseType);
@@ -42,20 +45,30 @@ UBase* USpeckleSerializer::DeserializeBase(const TSharedPtr<FJsonObject> Obj,
 				return Base; 
 		}

-		//If we couldn't even deserialize this to a Base
-		if(WorkingType == "Base" || BaseType == UBase::StaticClass())
+		if(IsLastChance)
+		{
+			//Try a fallback displayValue object
+			UBase* Base = NewObject<UBase>(GetTransientPackage(), UDisplayValueElement::StaticClass());
+			if(Base->Parse(Obj, ReadTransport))
+				return Base;
+
+			//If not, try a regular Base
+			Base = NewObject<UBase>(GetTransientPackage(), UBase::StaticClass());
+			if(Base->Parse(Obj, ReadTransport))
+				return Base;
+
+			UE_LOG(LogSpeckle, Warning, TEXT("Skipping deserilization of %s id: %s - object could not be deserilaized to Base"), *SpeckleType, *ObjectId );
+			return nullptr;
+		}
+		
+		//If we couldn't even deserialize this to a Base, something is quite wrong...
+		if(WorkingType == TEXT("Base") || BaseType == UBase::StaticClass())
 		{
 			UE_LOG(LogSpeckle, Warning, TEXT("Skipping deserilization of %s id: %s - object could not be deserilaized to Base"), *SpeckleType, *ObjectId );
 			return nullptr;
 		}
-
-		//Try the next type
-		if(!UObjectModelRegistry::ParentType(WorkingType, WorkingType))
-		{
-			WorkingType = "Base";
-			UE_LOG(LogSpeckle, Verbose, TEXT("Unrecognised SpeckleType %s - Object id: %s Will be deserialized as Base"), *SpeckleType, *ObjectId );
-		}
 	}
+	
 	return nullptr;
 }

@@ -1,12 +1,13 @@
-#include "Mixpanel.h"
+
+#include "Mixpanel.h"

 #include "Containers/UnrealString.h"
 #include "HttpModule.h"
 #include "Kismet/GameplayStatics.h"
 #include "LogSpeckle.h"
 #include "Interfaces/IHttpResponse.h"
-#include "Launch/Resources/Version.h"
 #include "Misc/Base64.h"
+#include "Runtime/Launch/Resources/Version.h"
 #include "Policies/CondensedJsonPrintPolicy.h"
 #include "Serialization/JsonSerializerMacros.h"
 #include "Serialization/JsonWriter.h"
@@ -15,23 +16,28 @@ const FString FAnalytics::MixpanelToken = TEXT("acd87c5a50b56df91a795e999812a3a4
 const FString FAnalytics::MixpanelServer = TEXT("https://analytics.speckle.systems");
 const FString FAnalytics::VersionedApplicationName = FString::Printf(TEXT("Unreal Engine %d.%d"), ENGINE_MAJOR_VERSION, ENGINE_MINOR_VERSION);

-void FAnalytics::TrackEvent(const FString& Email, const FString& Server, const FString& EventName)
+void FAnalytics::TrackEvent(const FString& Server, const FString& EventName)
 {
 	const TMap<FString, FString> CustomProperties;
-	TrackEvent(Email, Server, EventName, CustomProperties);
+	TrackEvent( Server, EventName, CustomProperties);
 }

-void FAnalytics::TrackEvent(const FString& Email, const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties)
+void FAnalytics::TrackEvent(const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties)
 {
-#if !SUPPRESS_SPECKLE_ANALYTICS
+	//Since we don't have access to users email address, we will hash the system user name instead (better than not tracking users at all) 
+	const FString UserID = FString(FPlatformProcess::ComputerName()) + FString(FPlatformProcess::UserName());
+	TrackEvent(UserID, Server, EventName, CustomProperties);
+}

-	
-	FString HashedEmail = "@" + Hash(Email); //prepending an @ so we distinguish logged and non-logged users
+void FAnalytics::TrackEvent(const FString& UserID, const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties)
+{
+
+	FString HashedUserID = "@" + Hash(UserID); //prepending an @ so we distinguish logged and non-logged users
 	FString HashedServer = Hash(Server);
 	
 	TMap<FString, FString> Properties 
 	{
-		{ "distinct_id", HashedEmail },
+		{ "distinct_id", HashedUserID },
 		{ "server_id", HashedServer },
 		{ "token", MixpanelToken },
 		{ "hostApp", "Unreal Engine" },
@@ -75,7 +81,6 @@ void FAnalytics::TrackEvent(const FString& Email, const FString& Server, const F
 	{
 		UE_LOG(LogSpeckle, Log, TEXT("Failed to send Mixpanel event to %s"), *MixpanelServer);
 	}
-#endif
 }

 FString FAnalytics::Hash(const FString& Input)
@@ -1,4 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.

 #include "Conversion/Converters/AggregateConverter.h"

@@ -57,13 +56,6 @@ UObject* UAggregateConverter::ConvertToNativeInternal(const UBase* Object, UWorl
 	UObject* Converter = GetConverter(Type).GetObject();
 	if(!IsValid(Converter))
 	{
-		//TODO convert displayValues then halt traversal
-			
-		
-		
-
-		
-		
 		if(Type != UBase::StaticClass())
 		{
 			UE_LOG(LogSpeckle, Warning, TEXT("Skipping Object %s: No conversion functions exist for %s"), *Object->Id, *Type->GetName());
@@ -1,12 +1,15 @@
-#include "Conversion/Converters/BlockConverter.h"
+
+#include "Conversion/Converters/BlockConverter.h"

 #include "Objects/Other/BlockInstance.h"
 #include "Objects/Utils/SpeckleObjectUtils.h"
 #include "Engine/World.h"
+#include "Objects/Other/RevitInstance.h"

 UBlockConverter::UBlockConverter()
 {
 	SpeckleTypes.Add(UBlockInstance::StaticClass());
+	SpeckleTypes.Add(URevitInstance::StaticClass());
 	
 	BlockInstanceActorType = AActor::StaticClass();
 	ActorMobility = EComponentMobility::Static;
@@ -14,13 +17,13 @@ UBlockConverter::UBlockConverter()

 UObject* UBlockConverter::ConvertToNative_Implementation(const UBase* SpeckleBase, UWorld* World, TScriptInterface<ISpeckleConverter>&)
 {
-	const UBlockInstance* Block = Cast<UBlockInstance>(SpeckleBase);
+	const UInstance* Block = Cast<UInstance>(SpeckleBase);
 	if(Block == nullptr) return nullptr;

 	return BlockToNative(Block, World);
 }

-AActor* UBlockConverter::BlockToNative(const UBlockInstance* Block, UWorld* World)
+AActor* UBlockConverter::BlockToNative(const UInstance* Block, UWorld* World)
 {
 	AActor* BlockActor = CreateEmptyActor(World, USpeckleObjectUtils::CreateTransform(Block->Transform));
 	//Return the block actor as is,
@@ -0,0 +1,53 @@
+
+#include "Conversion/Converters/CollectionConverter.h"
+
+#include "Objects/Collection.h"
+
+UCollectionConverter::UCollectionConverter()
+{
+    SpeckleTypes.Add(UCollection::StaticClass());
+
+    
+    ActorType = AActor::StaticClass();
+    ActorMobility = EComponentMobility::Static;
+}
+
+UObject* UCollectionConverter::ConvertToNative_Implementation(const UBase* SpeckleBase, UWorld* World,
+                                                            TScriptInterface<ISpeckleConverter>& AvailableConverters )
+{
+    const UCollection* p = Cast<UCollection>(SpeckleBase);
+	
+    if(p == nullptr) return nullptr;
+	
+    return CollectionToNative(p, World);
+}
+
+AActor* UCollectionConverter::CollectionToNative(const UCollection*, UWorld* World)
+{
+    AActor* MeshActor = CreateEmptyActor(World);
+
+    
+    return MeshActor;
+}
+
+AActor* UCollectionConverter::CreateEmptyActor(UWorld* World, const FActorSpawnParameters& SpawnParameters)
+{
+    AActor* Actor = World->SpawnActor<AActor>(ActorType, SpawnParameters);
+    USceneComponent* Scene = NewObject<USceneComponent>(Actor, "Root");
+    Actor->SetRootComponent(Scene);
+    Scene->RegisterComponent();
+    Scene->SetMobility(ActorMobility);
+    return Actor;
+}
+
+
+UBase* UCollectionConverter::ConvertToSpeckle_Implementation(const UObject* Object)
+{
+    return nullptr; //TODO implement ToSpeckle function
+}
+
+
+UCollection* UCollectionConverter::CollectionToSpeckle(const AActor* Object)
+{
+    return nullptr; //TODO implement ToSpeckle function
+}
@@ -1,5 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Conversion/Converters/MaterialConverter.h"

@@ -8,12 +6,15 @@
 #include "Materials/MaterialInstanceDynamic.h"
 #include "Objects/Other/RenderMaterial.h"
 #include "UObject/ConstructorHelpers.h"
+#include "Materials/MaterialInterface.h"
+#include "Misc/Paths.h"
+#include "UObject/Package.h"


 UMaterialConverter::UMaterialConverter()
 {
-	static ConstructorHelpers::FObjectFinder<UMaterial> SpeckleMaterial(TEXT("Material'/SpeckleUnreal/SpeckleMaterial.SpeckleMaterial'"));
-	static ConstructorHelpers::FObjectFinder<UMaterial> SpeckleGlassMaterial(TEXT("Material'/SpeckleUnreal/SpeckleGlassMaterial.SpeckleGlassMaterial'"));
+	static ConstructorHelpers::FObjectFinder<UMaterialInterface> SpeckleMaterial(TEXT("Material'/SpeckleUnreal/SpeckleMaterial.SpeckleMaterial'"));
+	static ConstructorHelpers::FObjectFinder<UMaterialInterface> SpeckleGlassMaterial(TEXT("Material'/SpeckleUnreal/SpeckleGlassMaterial.SpeckleGlassMaterial'"));

 	DefaultMeshMaterial = SpeckleMaterial.Object;
 	BaseMeshOpaqueMaterial = SpeckleMaterial.Object;
@@ -80,7 +81,7 @@ bool UMaterialConverter::TryGetOverride(const URenderMaterial* SpeckleMaterial,
 	{
 		if(ensureAlways(IsValid(Mat)) && Mat->GetName() == Name)
 		{
-			OutMaterial = MaterialOverridesById[MaterialID];
+			OutMaterial = *MaterialOverridesByName.Find(Mat);
 			return true;
 		}
 	}
@@ -1,12 +1,12 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Conversion/Converters/PointCloudConverter.h"

 #include "LidarPointCloudActor.h"
+#include "LidarPointCloudShared.h"
 #include "LidarPointCloudComponent.h"
 #include "Objects/Geometry/PointCloud.h"
-
+#include "Engine/World.h"
+#include "Runtime/Launch/Resources/Version.h"

 UPointCloudConverter::UPointCloudConverter()
 {
@@ -1,4 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.

 #include "Conversion/Converters/ProceduralMeshConverter.h"

@@ -10,7 +9,6 @@
 #include "Objects/Other/RenderMaterial.h"
 #include "Objects/Utils/SpeckleObjectUtils.h"

-// Setup some basics
 UProceduralMeshConverter::UProceduralMeshConverter()
 {
    SpeckleTypes.Add(UMesh::StaticClass());
@@ -20,7 +18,6 @@ UProceduralMeshConverter::UProceduralMeshConverter()
    ActorMobility = EComponentMobility::Static;
 }

-// Blueprint for converting data to 3D model 
 UObject* UProceduralMeshConverter::ConvertToNative_Implementation(const UBase* SpeckleBase, UWorld* World,
                                                            TScriptInterface<ISpeckleConverter>& AvailableConverters )
 {
@@ -69,19 +66,19 @@ AActor* UProceduralMeshConverter::MeshToNative(const UMesh* SpeckleMesh,
        
        if (n == 3) //Triangles
        {
-            Faces.Add(SpeckleMesh->Faces[i + 3]);
-            Faces.Add(SpeckleMesh->Faces[i + 2]);
            Faces.Add(SpeckleMesh->Faces[i + 1]);
+            Faces.Add(SpeckleMesh->Faces[i + 2]);
+            Faces.Add(SpeckleMesh->Faces[i + 3]);
        }
        else if(n == 4) // Quads
        {
+            Faces.Add(SpeckleMesh->Faces[i + 1]);
+            Faces.Add(SpeckleMesh->Faces[i + 3]);
            Faces.Add(SpeckleMesh->Faces[i + 4]);
-            Faces.Add(SpeckleMesh->Faces[i + 3]);
-            Faces.Add(SpeckleMesh->Faces[i + 1]);

-            Faces.Add(SpeckleMesh->Faces[i + 3]);
-            Faces.Add(SpeckleMesh->Faces[i + 2]);
            Faces.Add(SpeckleMesh->Faces[i + 1]);
+            Faces.Add(SpeckleMesh->Faces[i + 2]);
+            Faces.Add(SpeckleMesh->Faces[i + 3]);
        }
        else
        {
@@ -1,4 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.

 #include "Conversion/Converters/StaticMeshConverter.h"

@@ -14,25 +13,21 @@
 #include "Conversion/Converters/MaterialConverter.h"
 #include "Misc/ScopedSlowTask.h"
 #include "Objects/DisplayValueElement.h"
-#include "Objects/Geometry/Box.h"
 #include "Objects/Other/RenderMaterial.h"
 #include "Objects/Utils/SpeckleObjectUtils.h"
+#include "Components/StaticMeshComponent.h"
+#include "Misc/Paths.h"
+#include "UObject/Package.h"
+#include "Materials/MaterialInterface.h"

 #define LOCTEXT_NAMESPACE "FSpeckleUnrealModule"

-bool UStaticMeshConverter::CanConvertToNative_Implementation(TSubclassOf<UBase> BaseType)
-{
-	if(EnabledTypes.Contains(BaseType))
-		return EnabledTypes[BaseType];
-	
-	return false;
-}
-
 UStaticMeshConverter::UStaticMeshConverter()
 {
-	EnabledTypes.Add(UMesh::StaticClass(), true);
-	EnabledTypes.Add(UDisplayValueElement::StaticClass(), true);
-	EnabledTypes.Add(UBoxx::StaticClass(), true);
+	SpeckleTypes.Add(UMesh::StaticClass());
+	SpeckleTypes.Add(UDisplayValueElement::StaticClass());
+
+	HiddenTypes.Add("Objects.BuiltElements.Room");
 	
 #if WITH_EDITORONLY_DATA
 	UseFullBuild = true;
@@ -68,15 +63,6 @@ UObject* UStaticMeshConverter::ConvertToNative_Implementation(const UBase* Speck
 		return MeshToNativeActor(m, World, AvailableConverters);
 	}
 	
-	
-	const UBoxx* b = Cast<UBoxx>(SpeckleBase);
-	if(b != nullptr)
-	{
-		//Handle Element with Display Values
-		const UMesh* m = b->ToMesh();
-		return MeshToNativeActor(m, World, AvailableConverters);
-	}
-	
 	const UDisplayValueElement* d = Cast<UDisplayValueElement>(SpeckleBase);
 	if(d != nullptr)
 	{
@@ -115,10 +101,10 @@ AActor* UStaticMeshConverter::MeshesToNativeActor(const UBase* Parent, const TAr
 	FMatrix Transform = FMatrix::Identity;
 	// For single mesh, we check for transform
 	//TODO figure out how to handle DisplayValueElement with transform. Maybe we just grab transform from parent unconditionally? How does this affect blocks?
-	if(Parent == SpeckleMeshes[0])
-	{
-		Transform = SpeckleMeshes[0]->Transform;
-	}
+	// if(Parent == SpeckleMeshes[0])
+	// {
+	// 	Transform = SpeckleMeshes[0]->Transform;
+	// }
 	
 	AActor* Actor = CreateEmptyActor(World, USpeckleObjectUtils::CreateTransform(Transform));
 	TInlineComponentArray<UStaticMeshComponent*> Components;
@@ -135,6 +121,15 @@ AActor* UStaticMeshConverter::MeshesToNativeActor(const UBase* Parent, const TAr
 	}

 	MeshComponent->SetStaticMesh(Mesh);
+
+	for(const FString& t: HiddenTypes)
+	{
+		if(Parent->SpeckleType.Contains(t))
+		{
+			MeshComponent->SetVisibility(false);
+			break;
+		}
+	}
 	
 	int i = 0;
 	for(const UMesh* DisplayMesh : SpeckleMeshes)
@@ -281,6 +276,13 @@ UStaticMesh* UStaticMeshConverter::MeshesToNativeMesh(UObject* Outer, const UBas
 			for(int j = 0; j < n; j ++)
 			{
 				int32 VertIndex = SpeckleMesh->Faces[i + 1 + j];
+				
+				if(VertIndex < 0 || VertIndex >= Vertices.Num())
+				{
+					UE_LOG(LogSpeckle, Warning, TEXT("Invalid Polygon while creating mesh %s - index %d was outside the bounds of the vertex array, face is ignored"), *SpeckleMesh->Id, VertIndex);
+					continue;
+				}
+				
 				FVertexID Vert = Vertices[VertIndex];
 				bool AlreadyInSet;
 				Verts.Add(Vert, &AlreadyInSet);
@@ -411,7 +413,8 @@ UBase* UStaticMeshConverter::MeshToSpeckle(const UStaticMeshComponent* Object)

 void UStaticMeshConverter::FinishConversion_Implementation()
 {
-
+	if(StaticMeshesToBuild.Num() <= 0) return;
+	
 	FScopeLock Lock(&Lock_StaticMeshesToBuild);

 #if WITH_EDITOR
@@ -1,5 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Conversion/SpeckleConverterComponent.h"

@@ -7,17 +5,17 @@
 #include "API/SpeckleSerializer.h"
 #include "Conversion/Converters/AggregateConverter.h"
 #include "Conversion/Converters/BlockConverter.h"
+#include "Conversion/Converters/CollectionConverter.h"
 #include "Conversion/Converters/PointCloudConverter.h"
 #include "Conversion/Converters/StaticMeshConverter.h"
 #include "Conversion/Converters/MaterialConverter.h"
 #include "Misc/ScopedSlowTask.h"
-#include "Transports/Transport.h"
+#include "Objects/Utils/SpeckleObjectUtils.h"
 #include "UObject/ConstructorHelpers.h"
-#include "LogSpeckle.h"
+#include "Dom/JsonValue.h"

 #define LOCTEXT_NAMESPACE "FSpeckleUnrealModule"

-// Sets default values for this component's properties
 USpeckleConverterComponent::USpeckleConverterComponent()
 {
 	//TODO consider using an object library for default converters
@@ -25,6 +23,7 @@ USpeckleConverterComponent::USpeckleConverterComponent()
 	static ConstructorHelpers::FObjectFinder<UPointCloudConverter> PointCloudConverter(TEXT("PointCloudConverter'/SpeckleUnreal/Converters/DefaultPointCloudConverter.DefaultPointCloudConverter'"));
 	static ConstructorHelpers::FObjectFinder<UBlockConverter> BlockConverter(TEXT("BlockConverter'/SpeckleUnreal/Converters/DefaultBlockConverter.DefaultBlockConverter'"));
 	static ConstructorHelpers::FObjectFinder<UMaterialConverter> MaterialConverter(TEXT("MaterialConverter'/SpeckleUnreal/Converters/DefaultMaterialConverter.DefaultMaterialConverter'"));
+	static ConstructorHelpers::FObjectFinder<UCollectionConverter> CollectionConverter(TEXT("CollectionConverter'/SpeckleUnreal/Converters/DefaultCollectionConverter.DefaultCollectionConverter'"));
 	static ConstructorHelpers::FObjectFinder<UObject> CameraConverter(TEXT("CameraConverter'/SpeckleUnreal/Converters/DefaultCameraConverter.DefaultCameraConverter'"));
 	//static ConstructorHelpers::FObjectFinder<ULightConverter> LightConverter(TEXT("LightConverter'/SpeckleUnreal/Converters/DefaultLightConverter.DefaultLightConverter'"));

@@ -34,6 +33,7 @@ USpeckleConverterComponent::USpeckleConverterComponent()
 	SpeckleConverter->SpeckleConverters.Add(PointCloudConverter.Object);
 	SpeckleConverter->SpeckleConverters.Add(BlockConverter.Object);
 	SpeckleConverter->SpeckleConverters.Add(MaterialConverter.Object);
+	SpeckleConverter->SpeckleConverters.Add(CollectionConverter.Object);
 	SpeckleConverter->SpeckleConverters.Add(CameraConverter.Object);
 	//SpeckleConverter->SpeckleConverters.Add(LightConverter.Object);
 	
@@ -44,8 +44,19 @@ AActor* USpeckleConverterComponent::RecursivelyConvertToNative(AActor* AOwner, c
 	const TScriptInterface<ITransport>& LocalTransport, bool DisplayProgressBar, TArray<AActor*>& OutActors)
 {
 	float ObjectsToConvert{};
-	Base->TryGetDynamicNumber("totalChildrenCount", ObjectsToConvert);
-
+	if(Base->TotalChildrenCount > 0)
+	{
+		ObjectsToConvert = Base->TotalChildrenCount;
+	}
+	else
+	{
+		Base->TryGetDynamicNumber("totalChildrenCount", ObjectsToConvert);
+	}
+	if(ObjectsToConvert <= 1)
+	{
+		ObjectsToConvert = 99999; //A large number
+	}
+	
 	// Progress bar
 	FScopedSlowTask Progress(ObjectsToConvert + 2,
 		LOCTEXT("SpeckleConvertoNative","Converting Speckle Objects to Native"), DisplayProgressBar);
@@ -60,21 +71,6 @@ AActor* USpeckleConverterComponent::RecursivelyConvertToNative(AActor* AOwner, c
 	return RootActor;
 }

-// We should convert JSON to Speckle Object Streams
-TArray<FSpeckleStream> USpeckleConverterComponent::ConvertStreamsToNative(AActor* AOwner, const UBase* Base,
-	const TScriptInterface<ITransport>& LocalTransport, bool DisplayProgressBar, TArray<AActor*>& OutActors)
-{
-
-	return ArrayOfStreams;
-}
-
-
-
-
-
-
-
-
 AActor* USpeckleConverterComponent::RecursivelyConvertToNative_Internal(AActor* AOwner, const UBase* Base,
                                                                        const TScriptInterface<ITransport>& LocalTransport,
                                                                        FSlowTask* Task,
@@ -106,7 +102,7 @@ AActor* USpeckleConverterComponent::RecursivelyConvertToNative_Internal(AActor*
 	{
 		if(Task->ShouldCancel()) break;
 		
-		ConvertChild(Kvp.Value, AOwner, LocalTransport, Task, OutActors);
+		ConvertChild(Kvp.Value, NextOwner, LocalTransport, Task, OutActors);
 	}
 	return AOwner;
 }
@@ -128,7 +124,7 @@ void USpeckleConverterComponent::ConvertChild(const TSharedPtr<FJsonValue> Objec
 	const TArray<TSharedPtr<FJsonValue>>* ChildArr;
 	if (Object->TryGetArray(ChildArr))
 	{
-		for (const auto v : *ChildArr)
+		for (const auto& v : *ChildArr)
 		{
 			ConvertChild(v, AOwner, LocalTransport, Task, OutActors);
 		}
@@ -146,12 +142,14 @@ void USpeckleConverterComponent::AttachConvertedToOwner(AActor* AOwner, const UB
 		{
 	#if WITH_EDITOR
 			{
-				FString Name;
-				FText _Discard;
-				if( !(Base->TryGetDynamicString("name", Name) && FActorEditorUtils::ValidateActorName(FText::FromString(Name), _Discard)) )
+				FString Name = USpeckleObjectUtils::GetFriendlyObjectName(Base);
+				FText NameErrors;
+				
+				if(!FActorEditorUtils::ValidateActorName(FText::FromString(Name), NameErrors))
 				{
-					Name = FString::Printf(TEXT("%s - %s"), *Base->SpeckleType, *Base->Id);
+					Name = USpeckleObjectUtils::GetBoringObjectName(Base);
 				}
+				
 				NativeActor->SetActorLabel(Name);
 			}
 	#endif
@@ -1,4 +1,5 @@
-#include "LogSpeckle.h"
+
+#include "LogSpeckle.h"
 #include "Logging/LogMacros.h"

 DEFINE_LOG_CATEGORY(LogSpeckle);
@@ -0,0 +1,20 @@
+
+#include "Objects/Collection.h"
+
+
+
+
+bool UCollection::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport)
+{
+	if(!Super::Parse(Obj, ReadTransport)) return false;
+
+	// Parse Name property
+	if(!Obj->TryGetStringField(TEXT("name"), Name)) return false;
+	//DynamicProperties.Remove(TEXT("name")); //Don't remove from dynamic, as we pick this up to name the actor
+
+	// Parse collectionType
+	if(!Obj->TryGetStringField(TEXT("collectionType"), CollectionType)) return false;
+	DynamicProperties.Remove(TEXT("collectionType"));
+	
+	return true;
+}
@@ -1,5 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Objects/DisplayValueElement.h"

@@ -10,8 +8,6 @@
 TArray<FString> UDisplayValueElement::DisplayValueAliasStrings = {
 	"displayValue",
 	"@displayValue",
-	"displayMesh"
-	"@displayMesh"
 };


@@ -1,55 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "Objects/Geometry/Box.h"
-
-#include "Objects/Geometry/Plane.h"
-#include "Objects/Utils/SpeckleObjectUtils.h"
-
-bool UBoxx::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport)
-{
-	if(!Super::Parse(Obj, ReadTransport)) return false;
-	
-	const float ScaleFactor = USpeckleObjectUtils::ParseScaleFactor(Units);
-
-	const FString BasePlanePropertyName = TEXT("basePlane");
-	if (Obj->HasField(BasePlanePropertyName))
-	{
-		BasePlane = NewObject<UPlane>();
-		if(!BasePlane->Parse(Obj->GetObjectField(BasePlanePropertyName), ReadTransport)) return false;
-		DynamicProperties.Remove(BasePlanePropertyName);
-	}
-
-	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "xSize", ReadTransport, XSize)) return false;
-	XSize *= ScaleFactor;
-	DynamicProperties.Remove("xSize");
-	
-	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "ySize", ReadTransport, YSize)) return false;
-	YSize *= ScaleFactor;
-	DynamicProperties.Remove("ySize");
-	
-	
-	return true;
-}
-
-UMesh* UBoxx::ToMesh(UObject* Outer) const
-{
-
-	TArray<FVector> Vertices = {
-		FVector(),
-		FVector(),
-		FVector(),
-		FVector(),
-		FVector(),
-		FVector(),
-	};
-
-	TArray<int32> Faces = {
-	};
-	
-	//FMatrix transform = 
-	
-	
-	UMesh* Mesh = NewObject<UMesh>(Outer);
-	return Mesh;
-}
@@ -1,5 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Objects/Geometry/Mesh.h"

@@ -16,7 +14,7 @@ bool UMesh::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITra
 	if(USpeckleObjectUtils::TryParseTransform(Obj, Transform))
 	{
 		Transform.ScaleTranslation(FVector(ScaleFactor));
-		DynamicProperties.Remove("transform");
+		DynamicProperties.Remove(TEXT("transform"));
 	}
 	else
 	{
@@ -26,38 +24,38 @@ bool UMesh::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITra

 	//Parse Vertices
 	{
-		TArray<TSharedPtr<FJsonValue>> ObjectVertices = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField("vertices"), ReadTransport);
+		TArray<TSharedPtr<FJsonValue>> ObjectVertices = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField(TEXT("vertices")), ReadTransport);
 		const int32 NumberOfVertices = ObjectVertices.Num() / 3;

 		Vertices.Reserve(NumberOfVertices);

 		for (size_t i = 0, j = 0; i < NumberOfVertices; i++, j += 3)
 		{
-			Vertices.Add(Transform.InverseTransformPosition(FVector
+			Vertices.Add(FVector
 			(
 				ObjectVertices[j].Get()->AsNumber(),
 				-ObjectVertices[j + 1].Get()->AsNumber(),
 				ObjectVertices[j + 2].Get()->AsNumber()
-			) * ScaleFactor ));
+			) * ScaleFactor );
 		}
-		DynamicProperties.Remove("vertices");
+		DynamicProperties.Remove(TEXT("vertices"));
 	}

 	//Parse Faces
 	{
-		const TArray<TSharedPtr<FJsonValue>> FaceVertices = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField("faces"), ReadTransport);
+		const TArray<TSharedPtr<FJsonValue>> FaceVertices = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField(TEXT("faces")), ReadTransport);
 		Faces.Reserve(FaceVertices.Num());
-		for(const auto VertIndex : FaceVertices)
+		for(const auto& VertIndex : FaceVertices)
 		{
 			Faces.Add(VertIndex->AsNumber());
 		}
-		DynamicProperties.Remove("faces");
+		DynamicProperties.Remove(TEXT("faces"));
 	}

 	//Parse TextureCoords
 	{
 		const TArray<TSharedPtr<FJsonValue>>* TextCoordArray;
-		if(Obj->TryGetArrayField("textureCoordinates", TextCoordArray))
+		if(Obj->TryGetArrayField(TEXT("textureCoordinates"), TextCoordArray))
 		{
 			TArray<TSharedPtr<FJsonValue>> TexCoords = USpeckleObjectUtils::CombineChunks(*TextCoordArray, ReadTransport);
 	
@@ -71,14 +69,14 @@ bool UMesh::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITra
 					TexCoords[i + 1].Get()->AsNumber()
 				)); 
 			}
-			DynamicProperties.Remove("textureCoordinates");
+			DynamicProperties.Remove(TEXT("textureCoordinates"));
 		}
 	}

 	//Parse VertexColors
 	{
 		const TArray<TSharedPtr<FJsonValue>>* ColorArray;
-		if(Obj->TryGetArrayField("colors", ColorArray))
+		if(Obj->TryGetArrayField(TEXT("colors"), ColorArray))
 		{
 			TArray<TSharedPtr<FJsonValue>> Colors = USpeckleObjectUtils::CombineChunks(*ColorArray, ReadTransport);
 	
@@ -88,16 +86,16 @@ bool UMesh::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITra
 			{
 				VertexColors.Add(FColor(Colors[i].Get()->AsNumber()));
 			}
-			DynamicProperties.Remove("colors");
+			DynamicProperties.Remove(TEXT("colors"));
 		}
 	}

 	//Parse Optional RenderMaterial
-	if (Obj->HasField("renderMaterial"))
+	if (Obj->HasField(TEXT("renderMaterial")))
 	{
 		RenderMaterial = NewObject<URenderMaterial>();
-		RenderMaterial->Parse(Obj->GetObjectField("renderMaterial"), ReadTransport);
-		DynamicProperties.Remove("renderMaterial");
+		RenderMaterial->Parse(Obj->GetObjectField(TEXT("renderMaterial")), ReadTransport);
+		DynamicProperties.Remove(TEXT("renderMaterial"));
 	}
 	
 	AlignVerticesWithTexCoordsByIndex();
@@ -106,11 +104,7 @@ bool UMesh::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITra
 }


-/**
- * If not already so, this method will align vertices
- * such that a vertex and its corresponding texture coordinates have the same index.
- * See "https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/Geometry/Mesh.cs"
- */
+
 void UMesh::AlignVerticesWithTexCoordsByIndex()
 {
 	if(TextureCoordinates.Num() == 0) return;
@@ -1,31 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "Objects/Geometry/Plane.h"
-
-#include "Objects/Utils/SpeckleObjectUtils.h"
-
-bool UPlane::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport)
-{
-	if(!Super::Parse(Obj, ReadTransport)) return false;
-	
-	const float ScaleFactor = USpeckleObjectUtils::ParseScaleFactor(Units);
-	
-	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "origin", ReadTransport, Origin)) return false;
-	Origin *= ScaleFactor;
-	DynamicProperties.Remove("origin");
-	
-	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "normal", ReadTransport, Normal)) return false;
-	Normal *= ScaleFactor;
-	DynamicProperties.Remove("normal");
-	
-	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "ydir", ReadTransport, XDir)) return false;
-	XDir *= ScaleFactor;
-	DynamicProperties.Remove("ydir");
-	
-	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "xdir", ReadTransport, YDir)) return false;
-	YDir *= ScaleFactor;
-	DynamicProperties.Remove("xdir");
-		
-	return true;
-}
@@ -1,5 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Objects/Geometry/PointCloud.h"

@@ -14,7 +12,7 @@ bool UPointCloud::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterfac

 	//Parse Points
 	{
-		TArray<TSharedPtr<FJsonValue>> ObjectPoints = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField("points"), ReadTransport);
+		TArray<TSharedPtr<FJsonValue>> ObjectPoints = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField(TEXT("points")), ReadTransport);
 		
 		Points.Reserve(ObjectPoints.Num() / 3);
 		for (int32 i = 2; i < ObjectPoints.Num(); i += 3) 
@@ -32,7 +30,7 @@ bool UPointCloud::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterfac
 	
 	//Parse Colors
 	{
-		TArray<TSharedPtr<FJsonValue>> ObjectColors = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField("colors"), ReadTransport);
+		TArray<TSharedPtr<FJsonValue>> ObjectColors = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField(TEXT("colors")), ReadTransport);
 		
 		Colors.Reserve(ObjectColors.Num());
 		for (int32 i = 0; i < ObjectColors.Num(); i += 1) 
@@ -44,7 +42,7 @@ bool UPointCloud::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterfac

 	//Parse Sizes
 	{
-		TArray<TSharedPtr<FJsonValue>> ObjectSizes = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField("sizes"), ReadTransport);
+		TArray<TSharedPtr<FJsonValue>> ObjectSizes = USpeckleObjectUtils::CombineChunks(Obj->GetArrayField(TEXT("sizes")), ReadTransport);
 		
 		Sizes.Reserve(ObjectSizes.Num());
 		for (int32 i = 0; i < ObjectSizes.Num(); i += 1) 
@@ -1,4 +1,5 @@
-#include "Objects/ObjectModelRegistry.h"
+
+#include "Objects/ObjectModelRegistry.h"

 #include "Objects/Base.h"
 #include "Templates/SubclassOf.h"
@@ -20,65 +21,81 @@ void UObjectModelRegistry::GenerateTypeRegistry()
 		if (Class->IsChildOf(UBase::StaticClass()) &&
 			!Class->HasAnyClassFlags(CLASS_Abstract))
 		{
-			const FString& SpeckleType = Class->GetDefaultObject<UBase>()->SpeckleType;;
-
-			ensureAlwaysMsgf(!TypeRegistry.Contains(SpeckleType),
-				TEXT("Base class: %s conflicts with: %s for SpeckleType: %s"),
+			const FString& SpeckleType = Class->GetDefaultObject<UBase>()->SpeckleType;
+			const FString TypeName = GetTypeName(SpeckleType);
+			
+			ensureAlwaysMsgf(!TypeRegistry.Contains(TypeName),
+				TEXT("Base class: %s conflicts with: %s for TypeName: %s"),
 				*Class->GetName(),
 				*TypeRegistry[SpeckleType]->GetName(),
 				*SpeckleType);

-			TypeRegistry.Add(SpeckleType, *It);
+			TypeRegistry.Add(TypeName, *It);
 		}
 	}
 }


-
-TSubclassOf<UBase> UObjectModelRegistry::FindClosestType(const FString& SpeckleType)
+bool UObjectModelRegistry::SplitSpeckleType(const FString& SpeckleType, FString& OutRemainder, FString& OutTypeName, const FString& Split)
 {
-	FString TypeString(SpeckleType);
-	TSubclassOf<UBase> Type = nullptr;
-
-	while(!TryGetRegisteredType(TypeString, Type))
+	if(SpeckleType.Split(Split, &OutRemainder, &OutTypeName, ESearchCase::CaseSensitive, ESearchDir::FromEnd))
 	{
-		if(!ParentType(TypeString, TypeString)) return nullptr;
+		return true;	
+	}
+	else
+	{
+		OutTypeName = SpeckleType;
+		return false;
 	}
-		
-	return Type;
-	
 }

-bool UObjectModelRegistry::ParentType(const FString& Type, FString& NextType)
+FString UObjectModelRegistry::GetTypeName(const FString& SpeckleType)
 {
-	int32 DotSplitIndex;
-	Type.FindLastChar('.', DotSplitIndex);
-	int32 ColonSplitIndex;
-	Type.FindLastChar(':', ColonSplitIndex);
-	const int32 SplitIndex = FGenericPlatformMath::Max(DotSplitIndex, ColonSplitIndex);
-
-	if(SplitIndex <= 0) return false;
-		
-	NextType = Type.Left(SplitIndex);
-	return true;
+	FString Discard, Ret;
+	SplitSpeckleType(SpeckleType, Discard, Ret);
+	return Ret;
 }

-TSubclassOf<UBase> UObjectModelRegistry::GetRegisteredType(const FString& SpeckleType)
+FString UObjectModelRegistry::GetSimplifiedTypeName(const FString& SpeckleType)
+{
+	FString Discard, Ret;
+	SplitSpeckleType(SpeckleType,Discard, Ret, ".");
+	return Ret;
+}
+
+TSubclassOf<UBase> UObjectModelRegistry::GetAtomicType(const FString& SpeckleType)
+{
+
+	FString WorkingType;
+	FString Remainder = FString(SpeckleType);
+
+	while(SplitSpeckleType(Remainder, Remainder, WorkingType))
+	{
+		TSubclassOf<UBase> Type;
+		if(TryGetRegisteredType(WorkingType, Type))
+		{
+			return Type;
+		}
+	}
+	return UBase::StaticClass();
+}
+
+TSubclassOf<UBase> UObjectModelRegistry::GetRegisteredType(const FString& TypeName)
 {
 	TSubclassOf<UBase> Type = nullptr;
-	TryGetRegisteredType(SpeckleType, Type);
+	TryGetRegisteredType(TypeName, Type);
 	return Type;
 }

-bool UObjectModelRegistry::TryGetRegisteredType(const FString& SpeckleType, TSubclassOf<UBase>& OutType)
+bool UObjectModelRegistry::TryGetRegisteredType(const FString& TypeName, TSubclassOf<UBase>& OutType)
 {
 	if(TypeRegistry.Num() == 0) GenerateTypeRegistry();


-	const bool Contains = TypeRegistry.Contains(SpeckleType);
+	const bool Contains = TypeRegistry.Contains(TypeName);
 	if(Contains)
 	{
-		OutType = *TypeRegistry.Find(SpeckleType);
+		OutType = *TypeRegistry.Find(TypeName);
 	}
 	return Contains;
 }
@@ -1,5 +1,3 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Objects/Other/BlockInstance.h"
 #include "LogSpeckle.h"
@@ -17,19 +15,27 @@ bool UBlockInstance::Parse(const TSharedPtr<FJsonObject> Obj,  const TScriptInte
 	//Transform
 	if(!USpeckleObjectUtils::TryParseTransform(Obj, Transform)) return false;
 	Transform.ScaleTranslation(FVector(ScaleFactor));
-	DynamicProperties.Remove("Transform");
+	DynamicProperties.Remove(TEXT("Transform"));
 	

 	//Geometries
-	const TSharedPtr<FJsonObject>* BlockDefinitionPtr;
-	if(!Obj->TryGetObjectField("blockDefinition", BlockDefinitionPtr)) return false;
+	//NOTE: This logic differs greatly from sharp/py implementations
+	const TSharedPtr<FJsonObject>* DefPtr;
+	if(!(Obj->TryGetObjectField(TEXT("definition"), DefPtr) || Obj->TryGetObjectField(TEXT("blockDefinition"), DefPtr) )) return false;
 	
-	const FString RefID = BlockDefinitionPtr->operator->()->GetStringField("referencedId");
-	const TSharedPtr<FJsonObject> BlockDefinition = ReadTransport->GetSpeckleObject(RefID);
+	const FString RefID = DefPtr->operator->()->GetStringField(TEXT("referencedId"));
+	const TSharedPtr<FJsonObject> Definition = ReadTransport->GetSpeckleObject(RefID);
 	
-	if(BlockDefinition->TryGetStringField("name", Name)) DynamicProperties.Remove("Name");
+	if(!Obj->TryGetStringField(TEXT("name"), Name))
+	{
+		if(Definition->TryGetStringField(TEXT("name"), Name))
+		{
+			//The instance has no name, so we'll steal it from the definition
+			DynamicProperties.Add(TEXT("name"), Definition->TryGetField(TEXT("name")));
+		}
+	}

-	const auto Geometries = BlockDefinition->GetArrayField("geometry");
+	const auto Geometries = Definition->GetArrayField(TEXT("geometry"));

 	if(Geometries.Num() <= 0)
 	{
@@ -37,10 +43,10 @@ bool UBlockInstance::Parse(const TSharedPtr<FJsonObject> Obj,  const TScriptInte
 		return false;
 	}
 	
-	for(const auto Geo : Geometries)
+	for(const auto& Geo : Geometries)
 	{
 		const TSharedPtr<FJsonObject> MeshReference = Geo->AsObject();
-		const FString ChildId = MeshReference->GetStringField("referencedId");
+		const FString ChildId = MeshReference->GetStringField(TEXT("referencedId"));

 		if(ReadTransport->HasObject(ChildId))
 		{
@@ -50,11 +56,11 @@ bool UBlockInstance::Parse(const TSharedPtr<FJsonObject> Obj,  const TScriptInte
 		}
 		else UE_LOG(LogSpeckle, Warning, TEXT("Block definition references an unknown object id: %s"), *ChildId)
 	}
-	DynamicProperties.Remove("geometry");
+	DynamicProperties.Remove(TEXT("geometry"));
 	
 	// Intentionally don't remove blockDefinition from dynamic properties,
 	// because we want the converter to create the child geometries for us
-	//DynamicProperties.Remove("blockDefinition");
+	//DynamicProperties.Remove(TEXT("blockDefinition"));
 	
 	return true;
 	
@@ -0,0 +1,74 @@
+
+#include "Objects/Other/RevitInstance.h"
+#include "LogSpeckle.h"
+
+#include "API/SpeckleSerializer.h"
+#include "Objects/Utils/SpeckleObjectUtils.h"
+#include "Transports/Transport.h"
+
+bool URevitInstance::Parse(const TSharedPtr<FJsonObject> Obj,  const TScriptInterface<ITransport> ReadTransport)
+{
+	if(!Super::Parse(Obj, ReadTransport)) return false;
+	
+	const float ScaleFactor = USpeckleObjectUtils::ParseScaleFactor(Units);
+
+	//Transform
+	if(!USpeckleObjectUtils::TryParseTransform(Obj, Transform)) return false;
+	Transform.ScaleTranslation(FVector(ScaleFactor));
+	DynamicProperties.Remove(TEXT("Transform"));
+	
+
+	//Geometries
+	//NOTE: This logic differs greatly from sharp/py implementations
+	const TSharedPtr<FJsonObject>* DefPtr;
+	if(!Obj->TryGetObjectField(TEXT("definition"), DefPtr)) return false;
+	
+	const FString RefID = DefPtr->operator->()->GetStringField(TEXT("referencedId"));
+	const TSharedPtr<FJsonObject> Definition = ReadTransport->GetSpeckleObject(RefID);
+
+	const FString NameKey = TEXT("name");
+	if(!Obj->TryGetStringField(NameKey, Name))
+	{
+		if(Definition->TryGetStringField(NameKey, Name))
+		{
+			//The instance has no name, so we'll steal it from the definition
+			DynamicProperties.Add(NameKey, Definition->TryGetField(NameKey));
+		}
+	}
+	auto Geometries = TArray<TSharedPtr<FJsonValue>>();
+	const TArray<TSharedPtr<FJsonValue>>* ElementsPtr;
+	if(Definition->TryGetArrayField(TEXT("elements"), ElementsPtr))
+		Geometries.Append(*ElementsPtr);
+	const TArray<TSharedPtr<FJsonValue>>* DisplayValuePtr;
+	if(Definition->TryGetArrayField(TEXT("displayValue"), DisplayValuePtr))
+		Geometries.Append(*DisplayValuePtr);
+	
+
+	if(Geometries.Num() <= 0)
+	{
+		UE_LOG(LogSpeckle, Warning, TEXT("Instance definition has no geometry. id: %s"), *RefID)
+		return false;
+	}
+	
+	for(const auto& Geo : Geometries)
+	{
+		const TSharedPtr<FJsonObject> MeshReference = Geo->AsObject();
+		const FString ChildId = MeshReference->GetStringField(TEXT("referencedId"));
+
+		if(ReadTransport->HasObject(ChildId))
+		{
+			UBase* Child = USpeckleSerializer::DeserializeBase(ReadTransport->GetSpeckleObject(ChildId), ReadTransport);
+			if(IsValid(Child))
+				Geometry.Add(Child);
+		}
+		else UE_LOG(LogSpeckle, Warning, TEXT("Block definition references an unknown object id: %s"), *ChildId)
+	}
+	DynamicProperties.Remove(TEXT("geometry"));
+	
+	// Intentionally don't remove blockDefinition from dynamic properties,
+	// because we want the converter to create the child geometries for us
+	//DynamicProperties.Remove("blockDefinition");
+	
+	return true;
+	
+}
@@ -1,5 +1,3 @@
-// Copyright AEC Systems Ltd
-

 #include "Objects/Other/View3D.h"

@@ -12,26 +10,26 @@ bool UView3D::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<IT
 	const float ScaleFactor = USpeckleObjectUtils::ParseScaleFactor(Units);

 	// Parse optional Name property
-	if(Obj->TryGetStringField("name", Name)) DynamicProperties.Remove("name");
+	if(Obj->TryGetStringField(TEXT("name"), Name)) { }
 	
 	// Parse Origin
-	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "origin", ReadTransport, Origin)) return false;
+	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, TEXT("origin"), ReadTransport, Origin)) return false;
 	Origin *= ScaleFactor;
-	DynamicProperties.Remove("origin");
+	DynamicProperties.Remove(TEXT("origin"));

 	// Parse UpDirection
 	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "upDirection", ReadTransport, UpDirection)) return false;
 	UpDirection *= ScaleFactor;
-	DynamicProperties.Remove("upDirection");
+	DynamicProperties.Remove(TEXT("upDirection"));
 	
 	// Parse ForwardDirection
-	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "forwardDirection", ReadTransport, ForwardDirection)) return false;
+	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, TEXT("forwardDirection"), ReadTransport, ForwardDirection)) return false;
 	ForwardDirection *= ScaleFactor;
-	DynamicProperties.Remove("forwardDirection");
+	DynamicProperties.Remove(TEXT("forwardDirection"));

 	// Parse IsOrthogonal
-	if(!Obj->TryGetBoolField("isOrthogonal", IsOrthogonal)) return false;
-	DynamicProperties.Remove("isOrthogonal");
+	if(!Obj->TryGetBoolField(TEXT("isOrthogonal"), IsOrthogonal)) return false;
+	DynamicProperties.Remove(TEXT("isOrthogonal"));
 	
 	return true;
 }
@@ -1,13 +1,14 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Objects/Utils/SpeckleObjectUtils.h"

+#include "LogSpeckle.h"
 #include "API/SpeckleSerializer.h"
 #include "Engine/World.h"
+#include "Objects/ObjectModelRegistry.h"
 #include "Objects/Geometry/Mesh.h"
 #include "Transports/Transport.h"
-
+#include "Serialization/JsonWriter.h"
+#include "Serialization/JsonSerializer.h"

 TArray<TSharedPtr<FJsonValue>> USpeckleObjectUtils::CombineChunks(const TArray<TSharedPtr<FJsonValue>>& ArrayField, const TScriptInterface<ITransport> Transport)
 {
@@ -16,12 +17,12 @@ TArray<TSharedPtr<FJsonValue>> USpeckleObjectUtils::CombineChunks(const TArray<T
 	for(int32 i = 0; i < ArrayField.Num(); i++) 
 	{
 		FString Index;
-		if(ArrayField[i]->AsObject()->TryGetStringField("referencedId", Index))
+		if(ArrayField[i]->AsObject()->TryGetStringField(TEXT("referencedId"), Index))
 		{
 			if(!ensureAlwaysMsgf(Transport->HasObject(Index), TEXT("Failed to Dechunk array, Could not find chunk %s in transport"), *Index))
 				continue;
 			
-			const auto Chunk = Transport->GetSpeckleObject(Index)->GetArrayField("data");;
+			const auto Chunk = Transport->GetSpeckleObject(Index)->GetArrayField(TEXT("data"));;
 			ObjectPoints.Append(Chunk);
 		}
 		else
@@ -37,9 +38,9 @@ bool USpeckleObjectUtils::ResolveReference(const TSharedPtr<FJsonObject> Object,
 	FString SpeckleType;	
 	FString ReferenceID;

-	if (Object->TryGetStringField("speckle_type", SpeckleType)
-		&& SpeckleType == "reference"
-		&& Object->TryGetStringField("referencedId",ReferenceID))
+	if (Object->TryGetStringField(TEXT("speckle_type"), SpeckleType)
+		&& SpeckleType == TEXT("reference")
+		&& Object->TryGetStringField(TEXT("referencedId"),ReferenceID))
 	{
 		check(Transport != nullptr && Transport.GetObject() != nullptr)
 		
@@ -71,6 +72,9 @@ float USpeckleObjectUtils::ParseScaleFactor(const FString& UnitsString)
 		if (LUnits == "miles" || LUnits == "mile" || LUnits == "mi")
 			return 160934.4;

+		if (LUnits == "us_ft" || LUnits == "ussurveyfeet")
+			return 12000.0 / 3937.0;
+
 		return 100;
 	};

@@ -92,10 +96,10 @@ bool USpeckleObjectUtils::TryParseTransform(const TSharedPtr<FJsonObject> Speckl
 	const TSharedPtr<FJsonObject>* TransformObject;
 	const TArray<TSharedPtr<FJsonValue>>* TransformData;
 		
-	if(SpeckleObject->TryGetArrayField("transform", TransformData)) //Handle transform as array
+	if(SpeckleObject->TryGetArrayField(TEXT("transform"), TransformData)) //Handle transform as array
 	{ }
-	else if(SpeckleObject->TryGetObjectField("transform", TransformObject)
-		&& (*TransformObject)->TryGetArrayField("value", TransformData)) //Handle transform as object
+	else if(SpeckleObject->TryGetObjectField(TEXT("transform"), TransformObject)
+		&& (*TransformObject)->TryGetArrayField(TEXT("matrix"), TransformData)) //Handle transform as object
 	{ }
 	else return false;
 		
@@ -132,9 +136,9 @@ bool USpeckleObjectUtils::ParseVector(const TSharedPtr<FJsonObject> Object,
 	
 	double x = 0, y = 0, z = 0;
 	
-	if(!(Obj->TryGetNumberField("x", x)
-		&& Obj->TryGetNumberField("y", y)
-		&& Obj->TryGetNumberField("z", z))) return false;
+	if(!(Obj->TryGetNumberField(TEXT("x"), x)
+		&& Obj->TryGetNumberField(TEXT("y"), y)
+		&& Obj->TryGetNumberField(TEXT("z"), z))) return false;

 	OutObject = FVector(x,y,z);
 	//return true;
@@ -143,46 +147,11 @@ bool USpeckleObjectUtils::ParseVector(const TSharedPtr<FJsonObject> Object,
 	return ParseSpeckleObject<UMesh>(Obj, Transport, Mesh);
 }

-bool USpeckleObjectUtils::ParseIntervalProperty(const TSharedPtr<FJsonObject> Base, const FString& PropertyName,
-	const TScriptInterface<ITransport> ReadTransport, FVector2f<float>& OutObject)
-{
-	const TSharedPtr<FJsonObject>* OriginObject;
-	if(Base->TryGetObjectField(PropertyName, OriginObject)
-		&& ParseInterval(*OriginObject, ReadTransport, OutObject))
-	{
-		return true;
-	}
-	
-	return false;
-}
-
-bool USpeckleObjectUtils::ParseInterval(const TSharedPtr<FJsonObject> Object,
-	const TScriptInterface<ITransport> Transport, FVector2f& OutObject)
-{
-	if(!ensure(Object != nullptr)) return false;
-	
-	TSharedPtr<FJsonObject> Obj;
-	if(!ResolveReference(Object, Transport, Obj)) Obj = Object;
-	
-	double x = 0, y = 0, z = 0;
-	
-	if(!(Obj->TryGetNumberField("start", x)
-		&& Obj->TryGetNumberField("end", y)) return false;
-
-	OutObject = FVector2f(x,y,z);
-	//return true;
-
-	UMesh* Mesh;
-	return ParseSpeckleObject<UMesh>(Obj, Transport, Mesh);
-}
-
-
-
 template <typename TBase>  
 bool USpeckleObjectUtils::ParseSpeckleObject(const TSharedPtr<FJsonObject> Object,
 	const TScriptInterface<ITransport> Transport, TBase*& OutObject)
 {
-	static_assert(TIsDerivedFrom<TBase, UBase>::IsDerived, "Type TBase must inherit UBase");
+	static_assert(TIsDerivedFrom<TBase, UBase>::IsDerived, TEXT("Type TBase must inherit UBase"));

 	TSharedPtr<FJsonObject> Obj;
 	if(!ResolveReference(Object, Transport, Obj)) Obj = Object;
@@ -193,7 +162,36 @@ bool USpeckleObjectUtils::ParseSpeckleObject(const TSharedPtr<FJsonObject> Objec
 }


-AActor* USpeckleObjectUtils::SpawnActorInWorld(const TSubclassOf<AActor> Class, UWorld* World, const FTransform& Transform)
+AActor* USpeckleObjectUtils::SpawnActorInWorld(const UObject* WorldContextObject, const TSubclassOf<AActor> Class, UPARAM(ref) const FTransform& Transform)
 {
-	return World->SpawnActor(Class, &Transform, FActorSpawnParameters());
+	return WorldContextObject->GetWorld()->SpawnActor(Class, &Transform, FActorSpawnParameters());
 }
+
+FString USpeckleObjectUtils::DisplayAsString(const FString& msg, const TSharedPtr<FJsonObject> Obj)
+{
+	FString OutputString;
+	TSharedRef<TJsonWriter<>> Writer = TJsonWriterFactory<>::Create(&OutputString);
+	FJsonSerializer::Serialize(Obj.ToSharedRef(), Writer);
+	UE_LOG(LogSpeckle, Display, TEXT("resulting jsonString from %s -> %s"), *msg, *OutputString);
+	return OutputString;
+}
+
+FString USpeckleObjectUtils::GetFriendlyObjectName(const UBase* SpeckleObject)
+{
+	FString Prefix;
+	if(!(SpeckleObject->TryGetDynamicString(TEXT("name"), Prefix)
+		|| SpeckleObject->TryGetDynamicString(TEXT("Name"), Prefix)
+		|| SpeckleObject->TryGetDynamicString(TEXT("Family"), Prefix)))
+	{
+		Prefix = UObjectModelRegistry::GetSimplifiedTypeName(SpeckleObject->SpeckleType);
+	}
+	
+	return FString::Printf(TEXT("%s -- %s"), *Prefix, *SpeckleObject->Id);
+	
+}
+
+FString USpeckleObjectUtils::GetBoringObjectName(const UBase* SpeckleObject)
+{
+	const FString Prefix = UObjectModelRegistry::GetSimplifiedTypeName(SpeckleObject->SpeckleType);
+	return FString::Printf(TEXT("%s -- %s"), *Prefix, *SpeckleObject->Id);
+}
@@ -0,0 +1,427 @@
+
+#include "ReceiveSelectionComponent.h"
+
+#include "API/Models/SpeckleUser.h"
+#include "API/ClientAPI.h"
+#include "JsonObjectConverter.h"
+#include "LogSpeckle.h"
+
+#if WITH_EDITOR
+void UReceiveSelectionComponent::PostEditChangeProperty(FPropertyChangedEvent& e)
+{
+	Super::PostEditChangeProperty(e);
+
+	const FName PropertyName = (e.Property != nullptr) ? e.Property->GetFName() : NAME_None;
+	PropertyChangeHandler(PropertyName);
+}
+#endif
+
+void UReceiveSelectionComponent::PropertyChangeHandler(const FName& PropertyName)
+{
+	if(bManualMode) return;
+		
+	if (PropertyName == GET_MEMBER_NAME_CHECKED(UReceiveSelectionComponent, bManualMode))
+	{
+		Refresh();
+	}
+	else if (PropertyName == GET_MEMBER_NAME_CHECKED(UReceiveSelectionComponent, AuthToken)
+		|| PropertyName == GET_MEMBER_NAME_CHECKED(UReceiveSelectionComponent, ServerUrl))
+	{
+		IsAccountValid = !AuthToken.IsEmpty() && !ServerUrl.IsEmpty();
+		if(IsAccountValid)
+		{
+			//TODO maybe we should check URL is a valid URL?
+			ServerUrl.TrimEndInline();
+			while(ServerUrl.RemoveFromEnd("/")) { }
+			AuthToken.TrimEndInline();
+		}
+
+		UpdateStreams();
+	}
+	else if (PropertyName == GET_MEMBER_NAME_CHECKED(UReceiveSelectionComponent, SelectedStreamText)
+		&& !SelectedStreamText.IsEmpty())
+	{
+		IsStreamValid = Streams.Contains(SelectedStreamText);
+		if(IsStreamValid)
+		{
+			SelectStream(SelectedStreamText);
+		}
+		else UpdateStreams();
+	} 
+	else if (PropertyName == GET_MEMBER_NAME_CHECKED(UReceiveSelectionComponent, SelectedBranchText)
+		&& !SelectedBranchText.IsEmpty())
+	{
+		IsBranchValid = Branches.Contains(SelectedBranchText);
+		if(IsBranchValid)
+		{
+			SelectBranch(SelectedBranchText);
+		}
+		else UpdateBranches();
+	}
+	else if (PropertyName == GET_MEMBER_NAME_CHECKED(UReceiveSelectionComponent, SelectedCommitText)
+		&& !SelectedCommitText.IsEmpty())
+	{
+		IsCommitValid = Commits.Contains(SelectedCommitText);
+		if(IsCommitValid)
+		{
+			SelectCommit(SelectedCommitText);
+		}
+		else UpdateCommits();
+	}
+}
+
+
+void UReceiveSelectionComponent::Refresh()
+{
+	IsAccountValid = !AuthToken.IsEmpty() && !ServerUrl.IsEmpty();
+
+	UpdateStreams();
+}
+
+
+bool UReceiveSelectionComponent::TryGetSelectedCommit(FSpeckleCommit& OutCommit) const
+{
+	if(!bManualMode && IsCommitValid)
+	{
+		OutCommit = Commits.FindRef(SelectedCommitText);
+		return true;
+	}
+	return false;
+}
+
+bool UReceiveSelectionComponent::TryGetSelectedBranch(FSpeckleBranch& OutBranch) const
+{
+	if(!bManualMode && IsBranchValid)
+	{
+		OutBranch = Branches.FindRef(SelectedBranchText);
+		return true;
+	}
+	return false;
+}
+
+bool UReceiveSelectionComponent::TryGetSelectedStream(FSpeckleStream& OutStream) const
+{
+	if(!bManualMode && IsStreamValid)
+	{
+		OutStream = Streams.FindRef(SelectedStreamText);
+		return true;
+	}
+	return false;
+}
+
+void UReceiveSelectionComponent::OpenURLInBrowser() const
+{
+	const FString URL = GetUrl();
+
+	if(!ensure(FPlatformProcess::CanLaunchURL(*URL))) return;
+
+	FString LaunchErrors;
+	FPlatformProcess::LaunchURL(*URL, nullptr, &LaunchErrors);
+
+	if(LaunchErrors.IsEmpty())
+	{
+		UE_LOG(LogSpeckle, Log, TEXT("Launched URL \"%s\" in browser"), *URL);
+	}
+	else
+	{
+		UE_LOG(LogSpeckle, Warning, TEXT("Failed to launched URL \"%s\" in browser - %s"), *URL, *LaunchErrors);
+	}
+
+}
+
+bool UReceiveSelectionComponent::IsSelectionComplete(FString& OutStatusMessage) const
+{
+	if(bManualMode)
+	{
+		if(ServerUrl.IsEmpty()) OutStatusMessage = TEXT("Server Url is invalid, must specify a valid url");
+		else if(StreamId.IsEmpty()) OutStatusMessage = TEXT("Stream id is invalid, must specify a streamId");
+		else if(ObjectId.IsEmpty()) OutStatusMessage = TEXT("Object id is invalid, must specify a objectId");
+		else
+		{
+			OutStatusMessage = TEXT("Ready to recieve object");
+			return true;
+		}
+	}
+	else
+	{
+		if(!IsAccountValid) OutStatusMessage = TEXT("Account is invalid, please specify a valid server URL and token. (tokens can be created from your Speckle profiles page)"); 
+		else if(!IsStreamValid) OutStatusMessage = TEXT("Selected stream is invalid");
+		else if(!IsBranchValid) OutStatusMessage = TEXT("Selected branch is invalid");
+		else if(!IsCommitValid) OutStatusMessage = TEXT("Selected commit is invalid");
+		else
+		{
+			ensure(!ServerUrl.IsEmpty());
+			ensure(!StreamId.IsEmpty());
+			ensure(!ObjectId.IsEmpty());
+			OutStatusMessage = TEXT("Ready to recieve commit");
+			return true;
+		}
+	}
+	return false;
+}
+
+FString UReceiveSelectionComponent::GetUrl() const
+{
+	if(bManualMode)
+	{
+		return FString::Printf(TEXT("%s/streams/%s/objects/%s"),
+			*ServerUrl, *StreamId, *ObjectId);
+	}
+	
+	if(!IsStreamValid) return ServerUrl;
+	
+	if(!IsBranchValid)
+		return FString::Printf(TEXT("%s/streams/%s/"),
+			*ServerUrl, *GetSelectedStream().ID);
+
+	if(!IsCommitValid)
+		return FString::Printf(TEXT("%s/streams/%s/branches/%s"),
+			*ServerUrl, *GetSelectedStream().ID, *GetSelectedBranch().Name);
+	
+	return FString::Printf(TEXT("%s/streams/%s/commits/%s"),
+			*ServerUrl, *GetSelectedStream().ID, *GetSelectedCommit().ID);
+}
+
+TArray<FString> UReceiveSelectionComponent::GetStreamsOptions() const
+{
+	TArray<FString> Options;
+	Streams.GetKeys(Options);
+	return Options;
+}
+
+bool UReceiveSelectionComponent::SelectStream(const FString& DisplayId)
+{
+	const bool IsValid = !DisplayId.IsEmpty() && Streams.Contains(DisplayId);
+	if(IsValid && !bManualMode)
+	{
+		SelectedStreamText = DisplayId;
+		IsStreamValid = true;
+		StreamId = GetSelectedStream().ID;
+	}
+	else
+	{
+		SelectedStreamText = "";
+		IsStreamValid = false;
+	}
+	UpdateBranches();
+	return IsStreamValid;
+}
+
+void UReceiveSelectionComponent::UpdateStreams()
+{
+	Streams.Reset();
+	SelectStream("");
+
+	if(!IsAccountValid || bManualMode) return;
+	
+	const FString LogName(__FUNCTION__);
+	const FString Payload = FString::Printf(TEXT("{\"query\": \"query{activeUser{id streams(limit: %d){items{id name}}}}\"}"), Limit);
+
+	//Response Handling
+	auto OnComplete = [&](const FString& ResponseJson)
+	{
+		if(bManualMode) return;
+
+		FSpeckleUser Response;
+
+		if(!ensure(FJsonObjectConverter::JsonObjectStringToUStruct(*ResponseJson, &Response, 0, 0))) return;
+
+		const TArray<FSpeckleStream>& AvailableStreams = Response.Streams.Items;
+		//Assemble stream map
+		Streams.Reserve(AvailableStreams.Num());
+		for(const auto& s : Response.Streams.Items)
+		{
+			FString DisplayId = FString::Printf(TEXT("%s - %s"), *s.Name, *s.ID);
+			Streams.Add(DisplayId, s);
+		}
+
+		//Set default selection
+		if(AvailableStreams.Num() > 0)
+		{
+			const FSpeckleStream& s = AvailableStreams[0];
+			FString DisplayId = FString::Printf(TEXT("%s - %s"), *s.Name, *s.ID);
+
+			SelectStream(DisplayId);
+		}
+		
+		UE_LOG(LogSpeckle, Verbose, TEXT("%s was successful"), *LogName);
+	};
+	FAPIResponceDelegate CompleteDelegate;
+	CompleteDelegate.BindLambda(OnComplete);
+
+	//On error
+	FErrorDelegate ErrorDelegate;
+	ErrorDelegate.BindStatic(LogError, LogName);
+
+	FClientAPI::MakeGraphQLRequest(ServerUrl, AuthToken, "activeUser", Payload, LogName, CompleteDelegate, ErrorDelegate);
+	
+}
+
+FSpeckleStream UReceiveSelectionComponent::GetSelectedStream() const
+{
+	return Streams[SelectedStreamText];
+}
+
+TArray<FString> UReceiveSelectionComponent::GetBranchOptions()
+{
+	TArray<FString> Options;
+	Branches.GetKeys(Options);
+	return Options;
+}
+
+bool UReceiveSelectionComponent::SelectBranch(const FString& DisplayId)
+{
+	const bool IsValid = !DisplayId.IsEmpty() && Branches.Contains(DisplayId);
+	if(IsValid && !bManualMode)
+	{
+		SelectedBranchText = DisplayId;
+		IsBranchValid = true;
+	}
+	else
+	{
+		SelectedBranchText = "";
+		IsBranchValid=false;
+	}
+	UpdateCommits();
+	return IsBranchValid;
+}
+
+
+void UReceiveSelectionComponent::UpdateBranches()
+{
+	Branches.Reset();
+	SelectBranch("");
+
+	if(!IsStreamValid || bManualMode) return;
+
+	const FString LogName(__FUNCTION__);
+	const FString Payload = FString::Printf(TEXT("{\"query\": \"query{stream(id: \\\"%s\\\"){branches(limit: %d){items{id name}}}}\"}"), *GetSelectedStream().ID, Limit);
+
+	//Response Handling
+	auto OnComplete = [&](const FString& ResponseJson)
+	{
+		if(bManualMode) return;
+		
+		FSpeckleStream Response;
+		
+		if(!ensure(FJsonObjectConverter::JsonObjectStringToUStruct(*ResponseJson, &Response, 0, 0))) return;
+
+		const TArray<FSpeckleBranch>& AvailableBranches = Response.Branches.Items;
+		
+		//Assemble stream map
+		Branches.Reserve(AvailableBranches.Num());
+		for(const auto& b : AvailableBranches)
+		{
+			FString DisplayId = FString::Printf(TEXT("%s"), *b.Name);
+			Branches.Add(DisplayId, b);
+		}
+		
+		UE_LOG(LogSpeckle, Verbose, TEXT("%s was successful"), *LogName);
+		
+		//Set default selection
+		if(AvailableBranches.Num() > 0)
+		{
+			const FSpeckleBranch& b = AvailableBranches[0];
+			FString DisplayId = FString::Printf(TEXT("%s"), *b.Name);
+
+			SelectBranch(DisplayId);
+		}
+	};
+	FAPIResponceDelegate CompleteDelegate;
+	CompleteDelegate.BindLambda(OnComplete);
+
+	//On error
+	FErrorDelegate ErrorDelegate;
+	ErrorDelegate.BindStatic(LogError, LogName);
+
+	FClientAPI::MakeGraphQLRequest(ServerUrl, AuthToken, "stream", Payload,LogName, CompleteDelegate, ErrorDelegate);
+}
+
+
+FSpeckleBranch UReceiveSelectionComponent::GetSelectedBranch() const
+{
+	return Branches[SelectedBranchText];
+}
+
+TArray<FString> UReceiveSelectionComponent::GetCommitOptions()
+{
+	TArray<FString> Options;
+	Commits.GetKeys(Options);
+	return Options;
+}
+
+bool UReceiveSelectionComponent::SelectCommit(const FString& DisplayId)
+{
+	const bool IsValid = !DisplayId.IsEmpty() && Commits.Contains(DisplayId);
+	if(IsValid && !bManualMode)
+	{
+		SelectedCommitText = DisplayId;
+		IsCommitValid = true;
+		ObjectId = GetSelectedCommit().ReferencedObject;
+	}
+	else
+	{
+		SelectedCommitText = "";
+		IsCommitValid=false;
+		ObjectId = "";
+	}
+	return IsCommitValid;
+}
+
+void UReceiveSelectionComponent::UpdateCommits()
+{
+	Commits.Reset();
+	SelectCommit("");
+
+	if(!IsBranchValid || bManualMode) return;
+	
+	const FString LogName(__FUNCTION__);
+	const FString Payload = FString::Printf(TEXT("{\"query\": \"query{stream(id: \\\"%s\\\"){branch(name: \\\"%s\\\"){commits(limit: %d){items{id message referencedObject}}}}}\"}"), *GetSelectedStream().ID, *GetSelectedBranch().Name, Limit);
+	
+	//Response Handling
+	auto OnComplete = [&](const FString& ResponseJson)
+	{
+		if(bManualMode) return;
+		
+		FSpeckleStream Response;
+
+		if(!ensure(FJsonObjectConverter::JsonObjectStringToUStruct(*ResponseJson, &Response, 0, 0))) return;
+
+		const TArray<FSpeckleCommit>& AvailableCommits = Response.Branch.Commits.Items;
+		
+		//Assemble stream map
+		for(const auto& c :AvailableCommits)
+		{
+			FString DisplayId = FString::Printf(TEXT("%s - %s"), *c.Message, *c.ID);
+			Commits.Add(DisplayId, c);
+		}
+		
+		UE_LOG(LogSpeckle, Verbose, TEXT("%s was successful"), *LogName);
+		
+		//Set default selection
+		if(AvailableCommits.Num() > 0)
+		{
+			const FSpeckleCommit& c = AvailableCommits[0];
+			FString DisplayId = FString::Printf(TEXT("%s - %s"), *c.Message, *c.ID);
+			SelectCommit(DisplayId);
+		}
+	};
+	FAPIResponceDelegate CompleteDelegate;
+	CompleteDelegate.BindLambda(OnComplete);
+
+	//On error
+	FErrorDelegate ErrorDelegate;
+	ErrorDelegate.BindStatic(LogError, LogName);
+
+	FClientAPI::MakeGraphQLRequest(ServerUrl, AuthToken, "stream", Payload,LogName, CompleteDelegate, ErrorDelegate);
+}
+
+FSpeckleCommit UReceiveSelectionComponent::GetSelectedCommit() const
+{
+	return Commits[SelectedCommitText];
+}
+
+void UReceiveSelectionComponent::LogError(const FString& Message, const FString LogName)
+{
+	UE_LOG(LogSpeckle, Warning, TEXT("%s: %s"), *LogName, *Message)
+}
@@ -1,4 +1,3 @@
-// Copyright Epic Games, Inc. All Rights Reserved.

 #include "SpeckleUnreal.h"

@@ -1,7 +1,8 @@
+
 #include "SpeckleUnrealManager.h"

+#include "ReceiveSelectionComponent.h"
 #include "API/Operations/ReceiveOperation.h"
-
 #include "Transports/MemoryTransport.h"
 #include "Transports/ServerTransport.h"
 #include "LogSpeckle.h"
@@ -10,8 +11,8 @@
 #include "Misc/ScopedSlowTask.h"
 #include "Objects/Base.h"
 #include "Mixpanel.h"
+#include "API/SpeckleAPIFunctions.h"
 #include "Engine/Engine.h"
-#include "Interfaces/IHttpRequest.h"

 #define LOCTEXT_NAMESPACE "FSpeckleUnrealModule"

@@ -23,15 +24,12 @@ ASpeckleUnrealManager::ASpeckleUnrealManager()
 	RootComponent->SetRelativeScale3D(FVector(1,1,1));
    RootComponent->SetMobility(EComponentMobility::Static);

-	// Convert JSON to object models
 	Converter = CreateDefaultSubobject<USpeckleConverterComponent>(FName("Converter"));
-	
+	ReceiveSelection = CreateDefaultSubobject<UReceiveSelectionComponent>(FName("ReceiveSelection"));
 	KeepCache = true;
 	DisplayProgressBar = true;
-	ServerUrl = "https://speckle.xyz";
 }

-// Begin Play function (Receive)
 void ASpeckleUnrealManager::BeginPlay()
 {
 	Super::BeginPlay();
@@ -39,104 +37,86 @@ void ASpeckleUnrealManager::BeginPlay()
 	if(ImportAtRuntime) Receive();
 }

-// Start the Receive process
 void ASpeckleUnrealManager::Receive()
 {
+	// Check object to receive has been specified properly
+	FString StatusMessage;
+	if(!ReceiveSelection->IsSelectionComplete(StatusMessage))
+	{
+		HandleError(StatusMessage);
+		return;
+	}
+
+	// Delete all actors from previous receive operations
 	DeleteObjects();
+	
+	const FString ServerUrl = ReceiveSelection->ServerUrl;
+	const FString AuthToken = ReceiveSelection->AuthToken;
+	const FString StreamId = ReceiveSelection->StreamId;
+	const FString ObjectId = ReceiveSelection->ObjectId;
+	
+	FAnalytics::TrackEvent( ServerUrl, TEXT("NodeRun"), TMap<FString, FString> { {TEXT("name"), StaticClass()->GetName() }, {TEXT("worldType"), FString::FromInt(GetWorld()->WorldType)}});
+	FString Message = FString::Printf(TEXT("Fetching Objects from Speckle Server: %s"), *ServerUrl);
+	PrintMessage(Message);

-	// Trim parameters
-	ServerUrl.TrimEndInline();
-	while(ServerUrl.RemoveFromEnd("/")) { }
-	StreamID.TrimEndInline();
-	ObjectID.TrimEndInline();
-	AuthToken.TrimEndInline();
-
-	// Analytics
-	FAnalytics::TrackEvent(
-		"unknown",
-		"unknown",
-		"NodeRun",
-		TMap<FString, FString> {
-			{"name", StaticClass()->GetName() },
-			{"worldType", FString::FromInt(GetWorld()->WorldType)}}
-	);
-
-	// Clear cache 
-	if(!KeepCache && LocalObjectCache.GetObjectRef() != nullptr)
+	// Setup network transports
+	UServerTransport* ServerTransport = UServerTransport::CreateServerTransport(ServerUrl, StreamId, AuthToken);
+	
+	if(!KeepCache && LocalObjectCache)
 	{
 		LocalObjectCache.GetObjectRef()->ConditionalBeginDestroy();
 		LocalObjectCache = UMemoryTransport::CreateEmptyMemoryTransport();
 	}
+	if(!LocalObjectCache) LocalObjectCache = UMemoryTransport::CreateEmptyMemoryTransport();

-	// Probably a duplication
-	if(LocalObjectCache.GetObjectRef() == nullptr)
-	{
-		LocalObjectCache = UMemoryTransport::CreateEmptyMemoryTransport();
-	}
-	
-	// Debug message
-	FString Message = FString::Printf(TEXT("Fetching Objects from Speckle Server: %s"), *ServerUrl);
-	PrintMessage(Message);
-
-	// Error delegate
+	// Setup delegate callbacks
 	FTransportErrorDelegate ErrorDelegate;
 	ErrorDelegate.BindUObject(this, &ASpeckleUnrealManager::HandleError);
-
-	// Complete delegate
 	FTransportCopyObjectCompleteDelegate CompleteDelegate;
 	CompleteDelegate.BindUObject(this, &ASpeckleUnrealManager::HandleReceive, DisplayProgressBar);
-
-	// Create a server transport
-	UServerTransport* ServerTransport = UServerTransport::CreateServerTransport(ServerUrl,StreamID,AuthToken);
 	
-	// Receive 
-	ServerTransport->CopyObjectAndChildren(ObjectID, LocalObjectCache, CompleteDelegate, ErrorDelegate);
+	// Send request for objects
+	ServerTransport->CopyObjectAndChildren(ObjectId, LocalObjectCache, CompleteDelegate, ErrorDelegate);
+
+	// Read receipt (if receiving a commit object)
+	FSpeckleCommit Commit;
+	if(ReceiveSelection->TryGetSelectedCommit(Commit))
+	{
+		//TODO read receipt
+		USpeckleAPIFunctions::CommitReceived(Commit);
+	}
 }


-// Handle Received JSON
+
 void ASpeckleUnrealManager::HandleReceive(TSharedPtr<FJsonObject> RootObject, bool DisplayProgress)
 {
 	if(RootObject == nullptr) return;
-
-	// Create a Base Deserialization Object Model
+	
 	const UBase* Res = USpeckleSerializer::DeserializeBase(RootObject, LocalObjectCache);
-
 	if(IsValid(Res))
 	{
-		// Start conversion
 		Converter->RecursivelyConvertToNative(this, Res, LocalObjectCache, DisplayProgress, Actors);
-
-		// Finished Conversion - show debug message 
+		
 		FString Message = FString::Printf(TEXT("Converted %d Actors"), Actors.Num());
 		PrintMessage(Message);
 	}
 	else
 	{
-		// Object id from Json
 		FString Id;
-
-		// Try to get JSON id field
-		RootObject->TryGetStringField("id", Id);
-
-		// Debug message for error wrt to id
+		RootObject->TryGetStringField(TEXT("id"), Id);
 		FString Message = FString::Printf(TEXT("Failed to deserialise root object: %s"), *Id);
-
-		// Print Message
 		HandleError(Message);
 	}
 }

-// Error handler just prints a debug message
 void ASpeckleUnrealManager::HandleError(FString& Message)
 {
 	PrintMessage(Message, true);
 }

-// Print debug message
 void ASpeckleUnrealManager::PrintMessage(FString& Message, bool IsError) const
 {
-	// Show at Console log: "Error" or just "Log" message (Errors are shown in red in output console)
 	if(IsError)
 	{
 		UE_LOG(LogSpeckle, Error, TEXT("%s"), *Message);
@@ -145,19 +125,16 @@ void ASpeckleUnrealManager::PrintMessage(FString& Message, bool IsError) const
 	{
 		UE_LOG(LogSpeckle, Log, TEXT("%s"), *Message);
 	}
-
-	// Error as a debug message
+	
 	FColor Color = IsError? FColor::Red : FColor::Green;
 	GEngine->AddOnScreenDebugMessage(0, 5.0f, Color, Message);
 }

-// Delete Actors containing all the 3D models
+
 void ASpeckleUnrealManager::DeleteObjects()
 {
-	// If still converting, terminate process
 	Converter->FinishConversion();
-
-	// Destroy actors
+	
 	for (AActor* a : Actors)
 	{
 		if(IsValid(a)) a->Destroy();
@@ -166,7 +143,4 @@ void ASpeckleUnrealManager::DeleteObjects()
 	Actors.Empty();
 }

-
-
-
 #undef LOCTEXT_NAMESPACE
@@ -0,0 +1,77 @@
+
+#include "LogSpeckle.h"
+#include "Misc/AutomationTest.h"
+#include "ReceiveSelectionComponent.h"
+#include "Tests/AutomationCommon.h"
+
+#if WITH_DEV_AUTOMATION_TESTS
+
+
+class UMock : public UReceiveSelectionComponent
+{
+	friend class FReceiveSelectionComponentTest;
+	friend class FCheckValidSelection;
+	friend class FCheckLimitMatch;
+};
+
+DEFINE_LATENT_AUTOMATION_COMMAND_TWO_PARAMETER(FCheckValidSelection, FAutomationTestBase*, Test, UMock*, SelectionComponent);
+bool FCheckValidSelection::Update()
+{
+	const UMock* s = SelectionComponent;
+	
+	Test->TestTrue(TEXT("Account valid on set"), s->IsAccountValid);
+	Test->TestTrue(TEXT("Stream valid on set"), s->IsStreamValid);
+	Test->TestTrue(TEXT("Branch valid on set"), s->IsBranchValid);
+	Test->TestTrue(TEXT("Commit valid on set"), s->IsCommitValid);
+	return true;
+}
+
+DEFINE_LATENT_AUTOMATION_COMMAND_TWO_PARAMETER(FCheckLimitMatch, FAutomationTestBase*, Test, UMock*, SelectionComponent);
+bool FCheckLimitMatch::Update()
+{
+	const UMock* s = SelectionComponent;
+	
+	Test->TestTrue(TEXT("Fetched streams is less than limit"), s->Streams.Num() <= s->Limit);
+	Test->TestTrue(TEXT("Fetched branches is less than limit"), s->Branches.Num() <= s->Limit);
+	Test->TestTrue(TEXT("Fetched commits is less than limit"), s->Commits.Num() <= s->Limit);
+	return true;
+}
+
+
+IMPLEMENT_SIMPLE_AUTOMATION_TEST(FReceiveSelectionComponentTest, "SpeckleUnreal.ReceiveSelectionComponentTest", EAutomationTestFlags::EditorContext | EAutomationTestFlags::EngineFilter)
+
+bool FReceiveSelectionComponentTest::RunTest(const FString& Parameters)
+{
+#ifdef TEST_AUTH_TOKEN
+	UMock* s = NewObject<UMock>();
+
+	
+	//Test initialisation
+	TestFalse(TEXT("Account valid on initialise"), s->IsAccountValid);
+	TestFalse(TEXT("Stream valid on initialise"), s->IsStreamValid);
+	TestFalse(TEXT("Branch valid on initialise"), s->IsBranchValid);
+	TestFalse(TEXT("Commit valid on initialise"), s->IsCommitValid);
+	
+	
+	s->AuthToken = TEST_AUTH_TOKEN;
+	s->ServerUrl = TEXT("https://latest.speckle.dev");
+	s->bManualMode = false;
+	s->Refresh();
+	
+	//wait 5 seconds for HTTP requests to finish
+	ADD_LATENT_AUTOMATION_COMMAND(FWaitLatentCommand(5.0f));
+	
+	ADD_LATENT_AUTOMATION_COMMAND(FCheckValidSelection(this, s));
+	ADD_LATENT_AUTOMATION_COMMAND(FCheckLimitMatch(this, s));
+
+	return true;
+	
+#else
+	TestTrue(TEXT("TEST_AUTH_TOKEN definition exists"), false);
+	
+	return false;
+#endif
+	
+}
+#endif
+
@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #include "Misc/AutomationTest.h"
 #include "Objects/Base.h"
@@ -1,25 +0,0 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
-
-#include "Misc/AutomationTest.h"
-#include "Objects/Base.h"
-#include "Transports/ServerTransport.h"
-
-
-#if WITH_DEV_AUTOMATION_TESTS
-
-IMPLEMENT_SIMPLE_AUTOMATION_TEST(FServerTransportTest, "SpeckleUnreal.Transports.ServerTransport", EAutomationTestFlags::EditorContext | EAutomationTestFlags::ProductFilter)
-
-
-bool FServerTransportTest::RunTest(const FString& Parameters)
-{
-	FString ServerUrl = TEXT("https://example.com");
-	FString StreamId = TEXT("1234");
-	FString Token = TEXT("MyAuthToken");
-	auto Transport = UServerTransport::CreateServerTransport(ServerUrl, StreamId, Token);
-	
-	
-	return true;
-}
-
-
-#endif
@@ -1,7 +1,6 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Transports/MemoryTransport.h"
+
 #include "LogSpeckle.h"

 bool UMemoryTransport::HasObject(const FString& ObjectId) const
@@ -18,5 +17,5 @@ TSharedPtr<FJsonObject> UMemoryTransport::GetSpeckleObject(const FString& Object
 void UMemoryTransport::SaveObject(const FString& ObjectId, const TSharedPtr<FJsonObject> SerializedObject)
 {
 	SpeckleObjects.Add(ObjectId, SerializedObject);
-	UE_LOG(LogSpeckle, Log, TEXT("-----------> ADDED <-------------- %d"), SpeckleObjects.Num());
+	UE_LOG(LogSpeckle, Verbose, TEXT("Added %s to in memory transport, now %d objects total "), *ObjectId, SpeckleObjects.Num());
 }
@@ -1,10 +1,9 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-

 #include "Transports/ServerTransport.h"
+
 #include "LogSpeckle.h"
 #include "Mixpanel.h"
-
+#include "Runtime/Launch/Resources/Version.h"
 #include "JsonObjectConverter.h"
 #include "HttpModule.h"
 #include "Interfaces/IHttpRequest.h"
@@ -29,7 +28,6 @@ bool UServerTransport::HasObject(const FString& ObjectId) const
 	return false;
 }

-// Parse Root JSON
 void UServerTransport::HandleRootObjectResponse(const FString& RootObjSerialized,
 												TScriptInterface<ITransport> TargetTransport,
 												const FString& ObjectId) const
@@ -37,7 +35,7 @@ void UServerTransport::HandleRootObjectResponse(const FString& RootObjSerialized
 	TSharedPtr<FJsonObject> RootObj;
 	if(!LoadJson(RootObjSerialized, RootObj))
 	{
-		FString Message = FString::Printf( TEXT("A Root Object %s was recieved but was invalid and could not be deserialied"), *ObjectId);
+		FString Message = FString::Printf(TEXT("A Root Object %s was recieved but was invalid and could not be deserialied"), *ObjectId);
 		InvokeOnError(Message);
 		return;
 	}
@@ -45,7 +43,7 @@ void UServerTransport::HandleRootObjectResponse(const FString& RootObjSerialized
 	TargetTransport->SaveObject(ObjectId, RootObj);	
 	
 	// Find children are not already in the target transport
-	const auto Closures = RootObj->GetObjectField("__closure")->Values;
+	const auto Closures = RootObj->GetObjectField(TEXT("__closure"))->Values;
 	
 	TArray<FString> ChildrenIds; 
 	Closures.GetKeys(ChildrenIds);
@@ -62,7 +60,6 @@ void UServerTransport::HandleRootObjectResponse(const FString& RootObjSerialized
 }


-// Create HTTP Request for Commit Root objects (only ids of children)
 void UServerTransport::CopyObjectAndChildren(const FString& ObjectId,
 											 TScriptInterface<ITransport> TargetTransport,
 											 const FTransportCopyObjectCompleteDelegate& OnCompleteAction,
@@ -74,13 +71,21 @@ void UServerTransport::CopyObjectAndChildren(const FString& ObjectId,
 	// Create Request for Root Object
 	const FHttpRequestRef Request = FHttpModule::Get().CreateRequest();
 	const FString Endpoint = FString::Printf(TEXT("%s/objects/%s/%s/single"), *ServerUrl, *StreamId, *ObjectId);
-	Request->SetVerb("GET");
+	Request->SetVerb(TEXT("GET"));
 	Request->SetURL(Endpoint);
-	Request->SetHeader("Accept", TEXT("text/plain"));
-	Request->SetHeader("Authorization", "Bearer " + AuthToken);
+	Request->SetHeader(TEXT("Accept"), TEXT("text/plain"));
+	if(!AuthToken.IsEmpty())
+		Request->SetHeader(TEXT("Authorization"),FString::Printf(TEXT("Bearer %s"), *AuthToken));
+	Request->SetHeader(TEXT("apollographql-client-name"), TEXT("Unreal Engine"));
+	Request->SetHeader(TEXT("apollographql-client-version"), SPECKLE_CONNECTOR_VERSION);
 		
 	// Response Callback
-	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 3
+	auto ResponseHandler = [=, this](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable
+#else
+	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable
+#endif
+	
 	{
 		if(!bWasSuccessful)
 		{
@@ -112,17 +117,16 @@ void UServerTransport::CopyObjectAndChildren(const FString& ObjectId,
 		return;
 	}
 	UE_LOG(LogSpeckle, Verbose, TEXT("GET Request sent for root object at %s, awaiting response"), *Endpoint );
-	FAnalytics::TrackEvent("unknown", ServerUrl, "Receive");
+	FAnalytics::TrackEvent(ServerUrl, "Receive");
 }

-// Fetch Children JSON and parse it
 void UServerTransport::FetchChildren(TScriptInterface<ITransport> TargetTransport, const FString& ObjectId,
-																const TArray<FString>& ChildrenIds, int32 CStart) const
+									const TArray<FString>& ChildrenIds, int32 CStart) const
 {
 	// Check if all children have been fetched
 	if(ChildrenIds.Num() <= CStart)
 	{
-		UE_LOG(LogSpeckle, Log, TEXT("----------->PJSON < CSTART <-----------"));
+		UE_LOG(LogSpeckle, Log, TEXT("Finished fetching child Speckle objects"));
 		ensureAlwaysMsgf(this->OnComplete.ExecuteIfBound(TargetTransport->GetSpeckleObject(ObjectId)),
 		                                                               TEXT("Complete handler was not bound properly"));
 		return;
@@ -138,8 +142,7 @@ void UServerTransport::FetchChildren(TScriptInterface<ITransport> TargetTranspor
 		for (int32 i = CStart; i < CEnd; i++)
 		{
 			Writer->WriteValue(ChildrenIds[i]);
-		}
-		Writer->WriteArrayEnd();
+		}		Writer->WriteArrayEnd();
 		Writer->Close();
 	}

@@ -156,18 +159,23 @@ void UServerTransport::FetchChildren(TScriptInterface<ITransport> TargetTranspor
 	const FHttpRequestRef Request = FHttpModule::Get().CreateRequest();
 	{
 		const FString EndPoint = FString::Printf(TEXT("%s/api/getobjects/%s"), *ServerUrl, *StreamId);
-		Request->SetVerb("POST");
+		Request->SetVerb(TEXT("POST"));
 		Request->SetURL(EndPoint);
-		Request->SetHeader("Accept", TEXT("text/plain"));
-		Request->SetHeader("Authorization", "Bearer " + AuthToken);
-		Request->SetHeader("Content-Type", "application/json");
+		Request->SetHeader(TEXT("Accept"), TEXT("text/plain"));
+		if(!AuthToken.IsEmpty())
+			Request->SetHeader(TEXT("Authorization"), FString::Printf(TEXT("Bearer %s"), *AuthToken));
+		Request->SetHeader(TEXT("Content-Type"), TEXT("application/json"));
 		Request->SetContentAsString(Body);
 	}
 	
 	// Response Callback
-	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 3
+	auto ResponseHandler = [=, this](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable
+#else
+	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable
+#endif
 	{
-		// Any Fail
+		// Request Fail
 		if(!bWasSuccessful)
 		{
 			FString Message = FString::Printf(TEXT("Request for children of root object %s/%s failed: %s"),
@@ -193,7 +201,7 @@ void UServerTransport::FetchChildren(TScriptInterface<ITransport> TargetTranspor
 		
 		UE_LOG(LogSpeckle, Verbose, TEXT("Parsing %d downloaded objects..."), LineCount)

-		// Warning: Less objects then expected
+		// Warning: Fewer/More objects then expected
 		if(LineCount != CEnd - CStart)
 		{
 			UE_LOG(LogSpeckle, Warning, TEXT("Requested %d objects, but received %d"), CEnd - CStart, LineCount);
@@ -1,80 +1,52 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
-#pragma once
-#include "Interfaces/IHttpRequest.h"

-struct FSpeckleStream;
-struct FSpeckleBranch;
-struct FSpeckleCommit;
-struct FSpeckleGlobals;
-struct FSpeckleUser;
+#pragma once
+
+#include "Interfaces/IHttpRequest.h"
+#include "Dom/JsonObject.h"

 DECLARE_DELEGATE_OneParam(FErrorDelegate, const FString&);
-DECLARE_DELEGATE_OneParam(FFetchStreamDelegate, const TArray<FSpeckleStream>&);
-DECLARE_DELEGATE_OneParam(FFetchBranchDelegate, const TArray<FSpeckleBranch>&);
-DECLARE_DELEGATE_OneParam(FFetchCommitDelegate, const TArray<FSpeckleCommit>&);
-DECLARE_DELEGATE_OneParam(FFetchGlobalsDelegate, const FSpeckleGlobals&);
-DECLARE_DELEGATE_OneParam(FFetchUserDelegate, const FSpeckleUser&);
+DECLARE_DELEGATE_OneParam(FAPIResponceDelegate, const FString&);

- /**
-  * C++ wrapper for GraphQL requests
-  * See Operations to use with blueprint
-  */
- class FClientAPI
- {
+/**
+* C++ wrapper of Speckle's GraphQL API
+* Encapsulates sending HTTP requests with GraphQL Queries for specific resources
+*
+* Used to send GraphQL requests for commits, branches, streams, user info, collaborators etc.
+*
+* See `API/Operations` for usage examples
+*/
+class FClientAPI
+{

- 	
 public:
- 	
- 	
 	
- 	static void StreamsGet(   const FString& ServerUrl,
- 								const FString& AuthToken,
- 								const int32 Limit,
-								const FFetchStreamDelegate OnCompleteAction,
-								const FErrorDelegate OnErrorAction);
+	/**
+	 * Creates and sends a graphql query to the specified url.
+	 * Will check HTTP response for errors,
+	 * and unpack the response "data" object.
+	 * @param ServerUrl URL of the Speckle Server endpoint
+	 * @param AuthToken 
+	 * @param ResponsePropertyName Property name of the requested object. This will be the first name in the query (e.g. "stream", "streams", "user", etc)
+	 * @param PostPayload The POST payload containing the GraphQL request
+	 * @param RequestLogName Friendly name for this request (for error handling and logging)
+	 * @param OnCompleteAction Callback invoked on successful completion of the request, with the request object (as a JSON string)
+	 * @param OnErrorAction Callback invoked on any fatal error with, the error message.
+	 */
+	static void MakeGraphQLRequest(const FString& ServerUrl, const FString& AuthToken, const FString& ResponsePropertyName,
+	                               const FString& PostPayload, const FString& RequestLogName,
+	                               const FAPIResponceDelegate OnCompleteAction, const FErrorDelegate OnErrorAction);

- 	static void StreamGetBranches(  const FString& ServerUrl,
- 		                        const FString& AuthToken,
-								const FString& StreamId,
-								const int32 Limit,
-								const FFetchBranchDelegate OnCompleteAction,
-								const FErrorDelegate OnErrorAction);
+	

- 	static void StreamGetCommits(   const FString& ServerUrl,
- 	                            const FString& AuthToken,
- 	                            const FString& StreamId,
- 		                        const FString& BranchName,
- 		                        const int32 Limit,
-								const FFetchCommitDelegate OnCompleteAction,
-								const FErrorDelegate OnErrorAction);
-
- 	static void FetchGlobals(	const FString& ServerUrl,
-								const FString& AuthToken,
-								const FString& StreamId,
-								const FString& ReferencedObjectId,
-								const FFetchGlobalsDelegate OnCompleteAction,
-								const FErrorDelegate OnErrorAction);
-
- 	static void FetchUserData(	const FString& ServerUrl,
-								const FString& AuthToken,
-								const FFetchUserDelegate OnCompleteAction,
-								const FErrorDelegate OnErrorAction);
- 	
-
-
-
- 	
-
- 	//Utility functions
-
-    static FHttpRequestRef CreateGraphQLRequest(const FString& ServerUrl, FString AuthToken, const FString& PostPayload,
-                                                const FString& Encoding = TEXT("gzip"));
- 	
- 	static bool SendGraphQLRequest(const FHttpRequestRef Request, const FString& RequestName, const TFunctionRef<void(const FString& Message)> OnErrorAction);
+//protected:
+	
+	/// Helper function for creating post requests with a GraphQL query
+	static FHttpRequestRef CreatePostRequest(const FString& ServerUrl, FString AuthToken, const FString& PostPayload,
+	                                         const FString& Encoding = TEXT("gzip"));

 	static bool GetResponseAsJSON(const FHttpResponsePtr Response, const FString& RequestLogName, TSharedPtr<FJsonObject>& OutObject, const TFunctionRef<void(const FString& Message)> OnErrorAction);
- 	
- 	static bool CheckForOperationErrors(const TSharedPtr<FJsonObject> GraphQLResponse, FString& OutErrorMessage);
+
+	static bool CheckForOperationErrors(const TSharedPtr<FJsonObject> GraphQLResponse, FString& OutErrorMessage);
 	static bool CheckRequestFailed(bool bWasSuccessful, FHttpResponsePtr Response,  const FString& RequestName, const TFunctionRef<void(const FString& Message)> OnErrorAction);
 	
 };
@@ -0,0 +1,45 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SpeckleCommit.h"
+#include "SpeckleBranch.generated.h"
+
+/*
+* GraphQL model for Branch data
+* Properties are only when they explicitly requested (through the GraphQL request)
+* see https://github.com/specklesystems/speckle-sharp/blob/main/Core/Core/Api/GraphQL/Models.cs
+*/
+USTRUCT(BlueprintType)
+struct FSpeckleBranch
+{
+	GENERATED_BODY()
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString ID;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Name;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Description;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FSpeckleCommits Commits;
+	
+};
+
+USTRUCT(BlueprintType)
+struct FSpeckleBranches
+{
+	GENERATED_BODY();
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	int32 TotalCount = 0;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Cursor;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	TArray<FSpeckleBranch> Items;
+};
@@ -0,0 +1,29 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SpeckleCollaborator.generated.h"
+
+/*
+* GraphQL model for Collaborator data
+* Properties are only when they explicitly requested (through the GraphQL request)
+* see https://github.com/specklesystems/speckle-sharp/blob/main/Core/Core/Api/GraphQL/Models.cs
+*/
+USTRUCT(BlueprintType)
+struct FSpeckleCollaborator
+{
+	GENERATED_BODY()
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Id;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Name;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Role;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Avatar;
+	
+};
@@ -0,0 +1,65 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SpeckleCommit.generated.h"
+
+/*
+* GraphQL model for Commit data
+* Properties are only when they explicitly requested (through the GraphQL request)
+* see https://github.com/specklesystems/speckle-sharp/blob/main/Core/Core/Api/GraphQL/Models.cs
+*/
+USTRUCT(BlueprintType)
+struct FSpeckleCommit
+{
+	GENERATED_BODY();
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString ID;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Message;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString BranchName;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString AuthorName;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString AuthorId;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString AuthorAvatar;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString CreatedAt;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString SourceApplication;
+	
+    UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models", DisplayName="Referenced Object Id")
+	FString ReferencedObject;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString TotalChildrenCount;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	TArray<FString> Parents;
+	
+};
+
+USTRUCT(BlueprintType)
+struct FSpeckleCommits
+{
+	GENERATED_BODY();
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	int32 TotalCount = 0;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Cursor;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	TArray<FSpeckleCommit> Items;
+};
@@ -0,0 +1,77 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SpeckleBranch.h"
+#include "SpeckleCollaborator.h"
+
+#include "SpeckleStream.generated.h"
+
+/*
+* GraphQL model for Stream data
+* Properties are only when they explicitly requested (through the GraphQL request)
+* see https://github.com/specklesystems/speckle-sharp/blob/main/Core/Core/Api/GraphQL/Models.cs
+*/
+USTRUCT(BlueprintType)
+struct FSpeckleStream 
+{
+	GENERATED_BODY()
+
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models", DisplayName="Stream Id")
+	FString ID;
+
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	FString Name;
+
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	FString Description;
+
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	bool IsPublic = false;
+
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	FString Role;
+
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	FString	CreatedAt;
+
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	FString UpdatedAt;
+
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	FString FavoritedDate;
+	
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	TArray<FSpeckleCollaborator> Collaborators;
+
+	// Object properties are only set if explicitly requested by a custom GraphQL request
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	FSpeckleBranches Branches;
+
+	// Object properties are only set if explicitly requested by a custom GraphQL request
+	UPROPERTY(BlueprintReadOnly, DisplayName="Branch (Request Only)", Category="Speckle|API Models", AdvancedDisplay)
+	FSpeckleBranch Branch;
+
+	// Object properties are only set if explicitly requested by a custom GraphQL request
+	UPROPERTY(BlueprintReadOnly, DisplayName="Commit (Request Only)", Category="Speckle|API Models", AdvancedDisplay)
+	FSpeckleCommit Commit;
+
+	// Object properties are only set if explicitly requested by a custom GraphQL request
+	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
+	FSpeckleCommits Commits;
+};
+
+USTRUCT(BlueprintType)
+struct FSpeckleStreams
+{
+	GENERATED_BODY();
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	int32 TotalCount = 0;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Cursor;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	TArray<FSpeckleStream> Items;
+};
@@ -0,0 +1,47 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SpeckleStream.h"
+#include "SpeckleUser.generated.h"
+
+/*
+* GraphQL model for User data
+* Properties are only when they explicitly requested (through the GraphQL request)
+* see https://github.com/specklesystems/speckle-sharp/blob/main/Core/Core/Api/GraphQL/Models.cs
+*/
+USTRUCT(BlueprintType)
+struct FSpeckleUser
+{
+	GENERATED_BODY()
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Id;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Email;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Name;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Bio;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Company;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Avatar;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	bool Verified = false;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FString Role;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FSpeckleStreams Streams;
+	
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
+	FSpeckleStreams FavoriteStreams;
+};
@@ -1,48 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Kismet/BlueprintAsyncActionBase.h"
-#include "Objects/HighLevel/SpeckleBranch.h"
-
-#include "ReceiveBranchesOperation.generated.h"
-
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FReceiveBranchesOperationHandler,
-											const TArray<FSpeckleBranch>&, Branches,
-											const FString&, ErrorMessage);
-
-/**
- *   Receive All streams	
- */
-UCLASS()
-class SPECKLEUNREAL_API UReceiveBranchesOperation : public UBlueprintAsyncActionBase
-{
-	GENERATED_BODY()
-	
-public:
-	
-    UPROPERTY(BlueprintAssignable)
-    FReceiveBranchesOperationHandler OnReceiveSuccessfully;
-
-	UPROPERTY(BlueprintAssignable)
-    FReceiveBranchesOperationHandler OnError;
-
-	UFUNCTION(BlueprintCallable, BlueprintInternalUseOnly, Category = "Speckle|Operations", meta = (WorldContext = "WorldContextObject"))
-	static UReceiveBranchesOperation* ReceiveBranchesOperation(UObject* WorldContextObject,
-															const FString& ServerUrl, const FString& AuthToken, const FString& StreamId, int32 Limit = 20);
-	virtual void Activate() override;
-	
-protected:
-	void Request();
-	
-	FString ServerUrl;
-	FString AuthToken;
-	FString StreamId;
-	int32 Limit;
-
-	void HandleReceive(const TArray<FSpeckleBranch>& Branches);
-	
-	void HandleError(const FString& Message);
-};
@@ -1,53 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Kismet/BlueprintAsyncActionBase.h"
-#include "Objects/HighLevel/SpeckleCommit.h"
-
-#include "ReceiveCommitsOperation.generated.h"
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FReceiveCommitsOperationHandler, const TArray<FSpeckleCommit>&, Commits, FString, ErrorMessage);
-
-
-/**
- *   Receive All Commits	
- */
-UCLASS()
-class SPECKLEUNREAL_API UReceiveCommitsOperation : public UBlueprintAsyncActionBase
-{
-	GENERATED_BODY()
-	
-public:
-	
-    UPROPERTY(BlueprintAssignable)
-    FReceiveCommitsOperationHandler OnReceiveSuccessfully;
-
-	UPROPERTY(BlueprintAssignable)
-    FReceiveCommitsOperationHandler OnError;
-
-
-	UFUNCTION(BlueprintCallable, BlueprintInternalUseOnly, Category = "Speckle|Operations",
-						meta = (WorldContext = "WorldContextObject", BranchName = "main"))
-	static UReceiveCommitsOperation* ReceiveCommitsOperation(UObject* WorldContextObject,
-																const FString& ServerUrl,
-																const FString& AuthToken,
-																const FString& StreamId,
-																const FString& BranchName,
-																const int32 Limit = 20);
-	virtual void Activate() override;
-	
-protected:
-	void Request();
-	
-	FString ServerUrl;
-	FString AuthToken;
-	FString StreamId;
-	FString BranchName;
-	int32 Limit;
-
-	void HandleReceive(const TArray<FSpeckleCommit>& Commits);
-	
-	void HandleError(const FString& Message);
-};
@@ -1,48 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Kismet/BlueprintAsyncActionBase.h"
-#include "Objects/HighLevel/SpeckleGlobals.h"
-
-#include "ReceiveGlobalsOperation.generated.h"
-
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FReceiveGlobalsOperationHandler, const FSpeckleGlobals, Globals, FString, ErrorMessage);
-
-
-/**
- *   Receive My User Data in Speckle
- */
-UCLASS()
-class SPECKLEUNREAL_API UReceiveGlobalsOperation : public UBlueprintAsyncActionBase
-{
-	GENERATED_BODY()
-	
-public:
-	
-    UPROPERTY(BlueprintAssignable)
-    FReceiveGlobalsOperationHandler OnReceiveSuccessfully;
-
-	UPROPERTY(BlueprintAssignable)
-    FReceiveGlobalsOperationHandler OnError;
-	
-	UFUNCTION(BlueprintCallable, BlueprintInternalUseOnly, Category = "Speckle|Operations", meta = (WorldContext = "WorldContextObject"))
-	static UReceiveGlobalsOperation* ReceiveGlobalsOperation(UObject* WorldContextObject,
-	                                                         const FString& ServerUrl, const FString& AuthToken,
-	                                                         const FString& StreamId, const FString& ReferencedObjectId);
-	virtual void Activate() override;
-
-protected:
-	void Request();
-	
-	FString ServerUrl;
-	FString AuthToken;
-	FString StreamId;
-	FString ReferencedObjectId;
-
-	void HandleReceive(const FSpeckleGlobals& Object);
-	
-	void HandleError(const FString& Message);
-};
@@ -1,49 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Kismet/BlueprintAsyncActionBase.h"
-#include "Objects/HighLevel/SpeckleUser.h"
-
-#include "ReceiveMyUserDataOperation.generated.h"
-
-struct FSpeckleUser;
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FReceiveMyUserDataOperationHandler, const FSpeckleUser, MyUserData, FString, ErrorMessage);
-
-
-/**
- *   Receive My User Data in Speckle
- */
-UCLASS()
-class SPECKLEUNREAL_API UReceiveMyUserDataOperation : public UBlueprintAsyncActionBase
-{
-	GENERATED_BODY()
-	
-public:
-	
-    UPROPERTY(BlueprintAssignable)
-    FReceiveMyUserDataOperationHandler OnReceiveSuccessfully;
-
-	UPROPERTY(BlueprintAssignable)
-    FReceiveMyUserDataOperationHandler OnError;
-	
-
-	UFUNCTION(BlueprintCallable, BlueprintInternalUseOnly, Category = "Speckle|Operations",
-																meta = (WorldContext = "WorldContextObject"))
-	static UReceiveMyUserDataOperation* ReceiveMyUserDataOperation(UObject* WorldContextObject,
-		const FString& ServerUrl, const FString& AuthToken);
-	
-	virtual void Activate() override;
-	
-protected:
-	void Request();
-	
-	FString ServerUrl;
-	FString AuthToken;
-
-	void HandleReceive(const FSpeckleUser& Object);
-	
-	void HandleError(const FString& Message);
-};
@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -1,44 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Kismet/BlueprintAsyncActionBase.h"
-#include "Objects/HighLevel/SpeckleStream.h"
-
-#include "ReceiveStreamsOperation.generated.h"
-
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FReceiveStreamsOperationHandler, const TArray<FSpeckleStream>&, Streams, FString, ErrorMessage);
-
-/**
- *   Receive All streams	
- */
-UCLASS()
-class SPECKLEUNREAL_API UReceiveStreamsOperation : public UBlueprintAsyncActionBase
-{
-	GENERATED_BODY()
-	
-public:
-	
-    UPROPERTY(BlueprintAssignable)
-    FReceiveStreamsOperationHandler OnReceiveSuccessfully;
-
-	UPROPERTY(BlueprintAssignable)
-    FReceiveStreamsOperationHandler OnError;
-
-	UFUNCTION(BlueprintCallable, BlueprintInternalUseOnly, Category = "Speckle|Operations", meta = (WorldContext = "WorldContextObject"))
-	static UReceiveStreamsOperation* ReceiveStreamsOperation(UObject* WorldContextObject, const FString& ServerUrl, const FString& AuthToken, const int32 Limit = 20);
-	virtual void Activate() override;
-	
-protected:
-	void Request();
-	
-	FString ServerUrl;
-	FString AuthToken;
-	int32 Limit;
-
-	void HandleReceive(const TArray<FSpeckleStream>& Streams);
-	
-	void HandleError(const FString& Message);
-};
@@ -1,47 +0,0 @@
-// // Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
-//
-// #pragma once
-//
-// #include "CoreMinimal.h"
-// #include "Kismet/BlueprintAsyncActionBase.h"
-//
-// #include "SendOperation.generated.h"
-//
-//
-// class ITransport;
-// class UBase;
-//
-// DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FSendOperationHandler, const FString&, Id, const FString&, ErrorMessage);
-//
-// /**
-//  * 
-//  */
-// UCLASS()
-// class SPECKLEUNREAL_API USendOperation : public UBlueprintAsyncActionBase
-// {
-// 	GENERATED_BODY()
-// 	
-// public:
-// 	
-// 	UPROPERTY(BlueprintAssignable)
-// 	FSendOperationHandler OnSendSuccessfully;
-// 	
-// 	
-// 	UPROPERTY(BlueprintAssignable)
-// 	FSendOperationHandler OnErrorAction;
-//
-//
-// 	UFUNCTION(BlueprintCallable, Category = "Speckle|Operations", meta = (WorldContext = "WorldContextObject"))
-// 	static USendOperation* SendOperation(UObject* WorldContextObject, UBase* Base, TArray<TScriptInterface<ITransport>> Transports);
-// 	
-// 	virtual void Activate() override;
-// 	
-// protected:
-//
-// 	
-// 	TWeakObjectPtr<UBase> Base;
-// 	
-// 	TScriptArray<TScriptInterface<ITransport>> Transports;
-//
-// 	
-// };
@@ -0,0 +1,62 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Kismet/BlueprintAsyncActionBase.h"
+
+#include "SpeckleStreamAPIOperation.generated.h"
+
+
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FAPIResponseHandler, FString, JsonResponse, FString, ErrorMessage);
+
+/**
+ * Allows sending GraphQL queries to the Speckle GraphQL API
+ * 
+ */
+UCLASS()
+class SPECKLEUNREAL_API USpeckleStreamAPIOperation : public UBlueprintAsyncActionBase
+{
+	GENERATED_BODY()
+
+public:
+	
+    UPROPERTY(BlueprintAssignable)
+    FAPIResponseHandler OnReceiveSuccessfully;
+
+	UPROPERTY(BlueprintAssignable)
+    FAPIResponseHandler OnError;
+
+	/**
+	 * Sends an GraphQL queries to a speckle server's "/graphql" endpoint
+	 * E.g. for fetching stream/branch/commit/user info.
+	 *
+	 * @param	ServerUrl				The URL of the Speckle server
+	 * @param	AuthToken				The auth token of the user (optional for unprivilaged requests)
+	 * @param	GraphQlQuery			The GraphQl query (starting with `query{ }`)
+	 * @param	ResponsePropertyName	The name of the root property being requested.  (e.g. for a "query{user{...}" query, then the property name is  "user")
+	 * @param	RequestLogName			A friendly name for this request (logging and analytics) 
+	 */
+	UFUNCTION(BlueprintCallable, BlueprintInternalUseOnly, Category = "Speckle|Operations")
+	static USpeckleStreamAPIOperation* SpeckleStreamAPIOperation(
+		const FString& ServerUrl,
+		const FString& AuthToken,
+		const FString& GraphQlQuery,
+		const FString& ResponsePropertyName,
+		const FString& RequestLogName);
+	
+	virtual void Activate() override;
+	
+protected:
+	void Request();
+	
+	FString ServerUrl;
+	FString AuthToken;
+	FString Query;
+	FString RequestLogName;
+	FString ResponsePropertyName;
+	
+	void HandleReceive(const FString& ResponseJson);
+	
+	void HandleError(const FString& Message);
+
+};
@@ -0,0 +1,30 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Kismet/BlueprintFunctionLibrary.h"
+
+#include "SpeckleAPIFunctions.generated.h"
+
+struct FSpeckleCommit;
+/**
+ * Blueprint function library for Speckle API 
+ */
+UCLASS()
+class SPECKLEUNREAL_API USpeckleAPIFunctions : public UBlueprintFunctionLibrary
+{
+	GENERATED_BODY()
+
+public:
+	
+	UFUNCTION(BlueprintCallable, CustomThunk, Category="Speckle|API", meta=(CustomStructureParam="OutStruct", ExpandBoolAsExecs="ReturnValue"))
+	static UPARAM(DisplayName = "WasSucessful") bool DeserializeResponse(const FString& JsonString, int32& OutStruct);
+	DECLARE_FUNCTION(execDeserializeResponse);
+	
+	static bool GenericDeserializeResponse(const FString& JsonString, const UScriptStruct* StructType, void* OutStruct);
+
+	static void CommitReceived(FSpeckleCommit& Commit);
+
+
+	
+};
@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -10,7 +9,7 @@

 #include "BlockConverter.generated.h"

-class UBlockInstance;
+class UInstance;

 /**
 *  Converts Speckle Block Instance objects empty native actors with transform.
@@ -37,7 +36,7 @@ public:
 	virtual UBase* ConvertToSpeckle_Implementation(const UObject* Object) override;

 	UFUNCTION(BlueprintCallable, Category="ToNative")
-	virtual AActor* BlockToNative(const UBlockInstance* Block, UWorld* World);
+	virtual AActor* BlockToNative(const UInstance* Block, UWorld* World);
 	
 protected:
 	virtual AActor* CreateEmptyActor(UWorld* World, const FTransform& Transform, const FActorSpawnParameters& SpawnParameters = FActorSpawnParameters());
@@ -0,0 +1,53 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Conversion/SpeckleConverter.h"
+#include "Engine/EngineTypes.h"
+#include "Engine/World.h"
+
+#include "CollectionConverter.generated.h"
+
+class UCollection;
+
+
+/**
+ * Converts Speckle Mesh objects into native actors with a procedural mesh component.
+ * 
+ * Compared with the StaticMeshConverter, this converter has some serious limitations
+ * - Cannot convert displayValues,
+ * - N-gon faces will be ignored,
+ * - Meshes are transient, and won't persist on level reload
+ */
+UCLASS()
+class SPECKLEUNREAL_API UCollectionConverter :  public UObject, public ISpeckleConverter
+{
+	GENERATED_BODY()
+
+	CONVERTS_SPECKLE_TYPES()
+	
+public:
+	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="ToNative")
+	TSubclassOf<AActor> ActorType;
+	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="ToNative")
+	TEnumAsByte<EComponentMobility::Type> ActorMobility;
+	
+	// Sets default values for this actor's properties
+	UCollectionConverter();
+	
+	virtual UObject* ConvertToNative_Implementation(const UBase* SpeckleBase, UWorld* World,
+													 TScriptInterface<ISpeckleConverter>& AvailableConverters) override;
+	
+	virtual UBase* ConvertToSpeckle_Implementation(const UObject* Object) override;
+	
+	UFUNCTION(BlueprintCallable, Category="ToNative")
+	virtual AActor* CollectionToNative(const UCollection* SpeckleCollection, UWorld* World);
+	
+	UFUNCTION(BlueprintCallable, Category="ToNative")
+	virtual UCollection* CollectionToSpeckle(const AActor* Object);
+	
+	virtual AActor* CreateEmptyActor(UWorld* World, const FActorSpawnParameters& SpawnParameters = FActorSpawnParameters());
+	
+};
@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -30,6 +29,9 @@ class SPECKLEUNREAL_API UStaticMeshConverter : public UObject, public ISpeckleCo

 public:
 	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="ToNative")
+	TSet<FString> HiddenTypes; 
+	
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="ToNative")
 	TSubclassOf<AActor> MeshActorType;
 	
@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -10,7 +9,7 @@
 #include "SpeckleConverter.generated.h"


-UINTERFACE()
+UINTERFACE(BlueprintType)
 class SPECKLEUNREAL_API USpeckleConverter : public UInterface
 {
 	GENERATED_BODY()
@@ -35,6 +34,7 @@ public:
 	UObject* ConvertToNative(const UBase* SpeckleBase, UWorld* World, UPARAM(ref) TScriptInterface<ISpeckleConverter>& AvailableConverters);

 	/// Tries to convert a given Actor or Component into a Speckle Base
+	/// NOT IMPLEMENTED!!!
 	UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="ToSpeckle")
 	UBase* ConvertToSpeckle(const UObject* Object);

@@ -1,10 +1,8 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

 #include "CoreMinimal.h"
 #include "Components/ActorComponent.h"
-#include "Objects/HighLevel/SpeckleStream.h"

 #include "SpeckleConverterComponent.generated.h"

@@ -13,12 +11,13 @@ class ITransport;
 class ISpeckleConverter;
 class UBase;
 class UAggregateConverter;
+class FJsonValue;
 struct FSlowTask;

 /**
 * An Actor Component for encapsulating recursive conversion of Speckle Objects
 */
-UCLASS(ClassGroup=(Speckle), meta=(BlueprintSpawnableComponent))
+UCLASS(ClassGroup=(Speckle), meta=(BlueprintSpawnableComponent), HideCategories=(Activation, Collision, Cooking, Tags))
 class SPECKLEUNREAL_API USpeckleConverterComponent : public UActorComponent
 {
 	GENERATED_BODY()
@@ -31,29 +30,14 @@ public:
 	
 	// Sets default values for this component's properties
 	USpeckleConverterComponent();
-
 	
 	// Converts the given Base and all children into native actors.
 	UFUNCTION(BlueprintCallable, Category="Speckle|Conversion")
 	UPARAM(DisplayName = "RootActor") AActor* RecursivelyConvertToNative(AActor* AOwner, const UBase* Base,
 		       const TScriptInterface<ITransport>& LocalTransport, bool DisplayProgressBar, TArray<AActor*>& OutActors);
-
-	
-	// Converts the given Base and all children into native actors.
-	UFUNCTION(BlueprintCallable, Category="Speckle|Conversion")
-	UPARAM(DisplayName = "RootActor") TArray<FSpeckleStream> ConvertStreamsToNative(
-						AActor* AOwner,
-						const UBase* Base,
-						const TScriptInterface<ITransport>& LocalTransport,
-						bool DisplayProgressBar,
-						TArray<AActor*>& OutActors
-						);
-	
+		
 	UFUNCTION(BlueprintCallable, Category="Speckle|Conversion")
 	virtual void FinishConversion();
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Speckle|Conversion")
-	TArray<FSpeckleStream> ArrayOfStreams;
 	
 protected:

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once
 #include "CoreMinimal.h"
@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -14,8 +13,8 @@ protected:
 	static const FString VersionedApplicationName;

 public:
-	static void TrackEvent(const FString& Email, const FString& Server, const FString& EventName);
-	static void TrackEvent(const FString& Email, const FString& Server, const FString& EventName,
-																		const TMap<FString, FString>& CustomProperties);
+	static void TrackEvent(const FString& Server, const FString& EventName);
+	static void TrackEvent(const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties);
+	static void TrackEvent(const FString& UserID, const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties);
 	static FString Hash(const FString& Input);
-};
+};
@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0

 #pragma once

@@ -13,7 +12,7 @@ class ASpeckleUnrealManager;
 /**
 * Base type that all Object Models inherit from
 */
-UCLASS(BlueprintType)
+UCLASS(BlueprintType, meta=(DisplayName="Speckle Object (Base)"))
 class SPECKLEUNREAL_API UBase : public UObject
 {
 public:
@@ -22,7 +21,7 @@ public:
 	
 protected:
 	
-	explicit UBase(const wchar_t* SpeckleType): SpeckleType(SpeckleType) {}
+	explicit UBase(const TCHAR* SpeckleType): SpeckleType(FString(SpeckleType)) {}
 	explicit UBase(const FString& SpeckleType) : SpeckleType(SpeckleType) {}
 	
 public:
@@ -32,27 +31,36 @@ public:

 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
 	FString Id;
-	
-	TMap<FString, TSharedPtr<FJsonValue>> DynamicProperties; //TODO this won't be serialised!

 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
-	FString Units;
+	int64 TotalChildrenCount = 0;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
+	FString ApplicationId;

 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
 	FString SpeckleType;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
+	FString Units;
+	
+	TMap<FString, TSharedPtr<FJsonValue>> DynamicProperties; //TODO this won't be serialised!
+	
 	
 	virtual bool Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport)
 	{
 		bool IsValid = false;
 		DynamicProperties = Obj->Values;
-		if(Obj->TryGetStringField("id", Id))
+		if(Obj->TryGetStringField(TEXT("id"), Id))
 		{
 			IsValid = true;
-			DynamicProperties.Remove("id");
+			DynamicProperties.Remove(TEXT("id"));
 		}
 		
-		if(Obj->TryGetStringField("units", Units)) DynamicProperties.Remove("units");
-		if(Obj->TryGetStringField("speckle_type", SpeckleType)) DynamicProperties.Remove("speckle_type");
+		if(Obj->TryGetStringField(TEXT("units"), Units)) DynamicProperties.Remove(TEXT("units"));
+		if(Obj->TryGetStringField(TEXT("speckle_type"), SpeckleType)) DynamicProperties.Remove(TEXT("speckle_type"));
+		if(Obj->TryGetStringField(TEXT("applicationId"), ApplicationId)) DynamicProperties.Remove(TEXT("applicationId"));
+		if(Obj->TryGetNumberField(TEXT("totalChildrenCount"), TotalChildrenCount)) DynamicProperties.Remove(TEXT("totalChildrenCount"));

 		return IsValid;
 	}
@@ -0,0 +1,28 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Objects/Base.h"
+
+#include "Collection.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class SPECKLEUNREAL_API UCollection : public UBase
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|Objects")
+	FString Name;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|Objects")
+	FString CollectionType;
+	
+	UCollection() : UBase(TEXT("Speckle.Core.Models.Collection")) {}
+	
+	virtual bool Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport) override;
+};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jedd Morgan	bf54d78024	Fix build (#94 )	2024-05-09 16:54:46 +01:00
Jedd Morgan	c783fc6f75	Update README.md (#93 )	2024-05-09 15:32:21 +01:00
Jedd Morgan	3848791e4e	Added support for Unreal 5.4 (#92 ) * Bump to 2.19.0 * Bumped uplugin and added 5.4 * Added 5.4 to CI	2024-05-08 14:34:58 +01:00
Jedd Morgan	baa57b83fb	changed default server to app.speckle.systems (#91 )	2024-05-08 14:34:46 +01:00
Jedd Morgan	87e5281a5e	Merge pull request #90 from specklesystems/CNX-9353-Add-support-for-Unreal-5.4 Fixed warning for UE5.4 - converted string literals to TEXT macro	2024-05-08 14:34:34 +01:00
Jedd Morgan	54a6c8bdb6	Added text macro to all string literals	2024-05-07 22:52:14 +01:00
Jedd Morgan	cb236ad0c7	Merge pull request #89 from specklesystems/JR-Morgan-patch-1 Update README.md	2023-09-12 19:40:39 +01:00
Jedd Morgan	e76b50a157	Update README.md	2023-09-12 19:40:28 +01:00
Jedd Morgan	c91f5e12ce	Merge pull request #88 from specklesystems/jrm/5.3 Added marketplace build ci for UE 5.3	2023-09-12 19:25:01 +01:00
Jedd Morgan	fd71dd41ca	Added 5.3 ci	2023-09-12 19:21:10 +01:00
Jedd Morgan	caa56039e7	Merge pull request #87 from specklesystems/jrm/converter/collections Support for receiving Collections and various other Bug fixes	2023-08-31 20:29:15 +01:00
Jedd Morgan	c1f5476f77	Resolved warning with uninitialized struct members	2023-08-30 23:15:37 +01:00
Jedd Morgan	3c55f31a58	Removed baking mesh transforms from deserialization process	2023-08-30 22:49:43 +01:00
Jedd Morgan	fce06cba20	Fixed build issue with UE5.3 Preview 1	2023-08-30 21:38:42 +01:00
Jedd Morgan	2b6ab16b22	Removed EditCondition for Branch and Commit selection	2023-08-30 20:34:20 +01:00
Jedd Morgan	a60d4fef56	Added support for receiving collections	2023-08-30 18:33:36 +01:00
Jedd Morgan	6aa4afbd84	Merge pull request #86 from specklesystems/jrm/blueprint-type-fix fix(bp): exposed SpeckleConverter as a BP type	2023-07-18 23:32:43 +01:00
Jedd Morgan	b5f465e1a3	fix(bp): exposed SpeckleConverter as a BP type	2023-07-18 23:31:47 +01:00
Jedd Morgan	80b7cd886a	Merge pull request #85 from specklesystems/no-bom Removed BOM headers from files	2023-07-06 21:21:34 +01:00
Jedd Morgan	f57ee4658e	Merge remote-tracking branch 'origin/main' into no-bom	2023-07-06 21:20:47 +01:00
Jedd Morgan	af61b08fa2	fix(ci): added line to remove BOM headers before applying copyright info	2023-07-06 21:20:28 +01:00
Jedd Morgan	a6b5a09efa	Merge pull request #84 from specklesystems/no-bom fix(ci): added line to remove BOM headers before applying copyright info	2023-07-06 21:11:27 +01:00
Jedd Morgan	f07eb732da	fix(ci): added line to remove BOM headers before applying copyright info	2023-07-06 21:10:21 +01:00
Jedd Morgan	68cb85e029	Merge pull request #83 from specklesystems/activeUser Updated user requests to use the new activeUser query	2023-07-06 17:32:14 +01:00
Jedd Morgan	067d66ae16	Removed marketplace publishing for UE 4.26	2023-07-06 17:22:27 +01:00
Jedd Morgan	4b4eae32a2	chore(api): user -> activeUser	2023-07-06 17:15:43 +01:00
Jedd Morgan	72738bb01b	Merge pull request #81 from specklesystems/2.15 Fixes for build issues	2023-06-29 23:18:03 +01:00
Jedd Morgan	42b525107f	fix(build): Added missing inlcudes to fix issue with non-unity builds	2023-06-29 23:16:56 +01:00
Jedd Morgan	e5a06c8c4c	fix: Additional fix for requests with empty authtokens	2023-06-29 12:52:06 +01:00
Jedd Morgan	8205c40e53	Merge pull request #80 from specklesystems/2.15 Added CI for UE5.2	2023-06-16 02:02:50 +01:00
Jedd Morgan	f903742449	Added CI for UE5.2	2023-06-16 02:01:56 +01:00
Jedd Morgan	5af3717239	Merge pull request #79 from specklesystems/2.15 Bumped appolo headers	2023-06-16 01:58:14 +01:00
Jedd Morgan	761c7a28f8	Bumped appolo headers	2023-06-16 01:56:39 +01:00
Jedd Morgan	2c0564da64	Merge pull request #78 from specklesystems/2.14 Added support for new revit instances, and added support for UE5.2	2023-06-16 01:49:31 +01:00
Jedd Morgan	e0eecdfb38	Update README.md	2023-06-16 01:48:47 +01:00
Jedd Morgan	feae0da6c6	Added support for UE 5.2	2023-06-16 01:24:29 +01:00
Jedd Morgan	ee8963535b	Merge remote-tracking branch 'origin/main' into 2.14	2023-06-16 01:04:39 +01:00
Jedd Morgan	b11c041a4e	feat: Added support for new instances	2023-06-16 00:58:09 +01:00
Jedd Morgan	f9bdd24bc9	Merge pull request #76 from specklesystems/gergo/ciContextUpdate add circleci context to the publish job	2023-06-15 15:33:31 +01:00
Jedd Morgan	8c67c81cc1	Merge pull request #77 from moihack/main Fixed crash when overriding material by Name	2023-06-15 14:27:08 +01:00
moihack	b5d09a1f2f	Fixed crash when overriding material by Name	2023-05-18 20:11:12 +03:00
Alan Rynne	25cda6e272	ci: Updated github actions to use new actions repo	2023-01-09 20:53:09 +01:00
Gergő Jedlicska	9fd8ef90c9	add circleci context to the publish job	2023-01-06 11:58:14 +01:00
Jedd Morgan	582dfe217d	Merge pull request #75 from specklesystems/ue5.1 feat: Added support for UE 5.1	2022-11-30 22:38:43 +00:00
Jedd Morgan	a4d452b9be	feat: Added support for UE 5.1	2022-11-30 22:29:41 +00:00
Jedd Morgan	96861937e1	Merge pull request #74 from specklesystems/jrm/ue5.1-fix Buiding on UE5.1-preview 2 now works.	2022-10-25 23:52:43 +01:00
JR-Morgan	e25f56eca9	Fix(editor): Fixed issue with REINST blueprint converter classes in UE5.1	2022-10-25 23:39:19 +01:00
Jedd Morgan	dcc14bf826	Merge pull request #71 from specklesystems/userid-fix user id fix	2022-09-02 14:59:37 +01:00
JR-Morgan	5a65dd7759	fix: Fixed issue with events incorrectly tracking UserID	2022-09-02 14:53:01 +01:00
Jedd Morgan	d42bfd584a	Update README.md	2022-09-01 17:53:29 +01:00
Jedd Morgan	70fc6a717e	Merge pull request #70 from specklesystems/apollo-headers feat(core): Added apollo headers to graphQL requests	2022-09-01 17:44:03 +01:00
JR-Morgan	552b47b312	feat(core): Added apollo headers to graphQL requests	2022-09-01 17:40:13 +01:00
Jedd Morgan	6180e40537	Merge pull request #69 from moihack/main Fixed triangle order in ProceduralMeshConverter	2022-09-01 17:13:47 +01:00
moihack	dab56d331a	Fixed triangle order in ProceduralMeshConverter	2022-08-24 11:32:13 +03:00
Jedd Morgan	2d848aa452	Merge pull request #67 from specklesystems/copyright-ci Copyright notice to be applied through CI	2022-08-08 16:04:41 +01:00
JR-Morgan	016e31c5a4	Copyright notice to be applied through CI	2022-08-07 18:03:00 +01:00
JR-Morgan	a41081a7db	Added copyright notice to build files	2022-08-02 17:36:34 +01:00
JR-Morgan	13d44abe21	Ignored licence for marketplace deploy	2022-08-02 17:33:06 +01:00
JR-Morgan	753170f50e	Circle CI manual deployment	2022-08-02 17:12:25 +01:00
JR-Morgan	dc4638eb1a	Fixed issue with .circleci being incorrectly included in git archive	2022-08-02 17:01:51 +01:00
Jedd Morgan	c094f3f59d	Marketplace changes (#66 ) * Updated Readme and Filterplugin to include readme * Update README.md * Bumped version * Update README.md	2022-08-02 15:35:27 +01:00
Jedd Morgan	b18e7a4149	Added CI workflow for marketplace deployment (#65 )	2022-07-26 18:56:44 +01:00
JR-Morgan	41684060c0	Merge branch 'main' into graphql-improvements	2022-06-27 02:50:35 +01:00
JR-Morgan	3f612bfc9d	Automation tests for graphql nodes	2022-06-27 02:48:52 +01:00
Jedd Morgan	3d6f16d52b	Merge pull request #64 from specklesystems/graphql-improvements Stream/Branch/Commit fetching editor UI and graphql blueprint	2022-06-27 01:58:07 +01:00
JR-Morgan	8e8beb1baf	Stream/Branch/Commit fetching editor UI and graphql blueprint	2022-06-22 01:47:00 +01:00
Jedd Morgan	43a84bd7f6	Merge pull request #63 from specklesystems/stream-operations Stream/Branch/Commit Fetching	2022-06-13 14:21:51 +01:00
JR-Morgan	c908bd7152	Merge remote-tracking branch 'origin' into stream-operations	2022-06-10 03:38:36 +01:00
JR-Morgan	2857e87860	Generalised graphQL query code and removed globals fetching	2022-06-09 23:43:38 +01:00
Jedd Morgan	45266db151	Merge pull request #60 from specklesystems/cross-platform-build-fix Fixed linux building with CLang compiler	2022-05-25 01:16:08 +01:00
JR-Morgan	8f38794dd1	Fixed linux building with CLang compiler	2022-05-24 17:10:43 +01:00